From eb5e7297274dc4b250fe889dbdb57c8958082fa2 Mon Sep 17 00:00:00 2001
From: Widevine Buildbot <widevine-device-buildbot@google.com>
Date: Thu, 1 Sep 2016 17:53:10 +0000
Subject: [PATCH] Generate SDK documents for commit
 c3d1dc1733dd3ab05bceedf52d86857e6ad611bc

---
 docs/annotated.html                           |    2 +-
 docs/classes.html                             |    2 +-
 ...ia_1_1mp4_1_1HandlerReference-members.html |    2 +-
 ..._1_1media_1_1RsaRequestSigner-members.html |    2 +-
 docs/d0/d06/mpd__flags_8cc_source.html        |    2 +-
 ...ka_1_1media_1_1HttpKeyFetcher-members.html |    2 +-
 ...oder__configuration__record_8h_source.html |    2 +-
 docs/d0/d0e/muxer__options_8h_source.html     |    2 +-
 ...media_1_1mp2t_1_1TsSectionPmt-members.html |    2 +-
 .../structshaka_1_1media_1_1VPxFrameInfo.html |    2 +-
 ...H265ByteToUnitStreamConverter-members.html |    2 +-
 ..._1_1media_1_1mp4_1_1VTTCueBox-members.html |    2 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPat.html |    2 +-
 .../structshaka_1_1media_1_1MuxerOptions.html |    2 +-
 .../d0/d30/mock__mpd__notifier_8h_source.html |    2 +-
 docs/d0/d32/mp2t__common_8h_source.html       |    2 +-
 .../d33/classshaka_1_1MockRepresentation.html |    2 +-
 docs/d0/d35/es__descriptor_8cc_source.html    |    2 +-
 ...s__notify__muxer__listener_8cc_source.html |    2 +-
 docs/d0/d3a/webm__constants_8h_source.html    |    2 +-
 ...mp4_1_1ProtectionSystemSpecificHeader.html |    2 +-
 docs/d0/d42/aes__cryptor_8h_source.html       |   10 +-
 ...idevine__encryption__flags_8cc_source.html |    2 +-
 docs/d0/d46/fourccs_8h_source.html            |    2 +-
 ...nfo__dump__muxer__listener_8cc_source.html |    2 +-
 ...ia_1_1mp4_1_1MediaInformation-members.html |    2 +-
 ...haka_1_1media_1_1AudioTimestampHelper.html |    2 +-
 .../d4e/libcrypto__threading_8cc_source.html  |    2 +-
 ...a_1_1media_1_1mp2t_1_1TsMuxer-members.html |    2 +-
 ...dia_1_1MpdNotifyMuxerListener-members.html |    2 +-
 ...classshaka_1_1media_1_1ThreadedIoFile.html |    2 +-
 ..._1_1StreamDescriptorCompareFn-members.html |    2 +-
 ...a_1_1media_1_1mp4_1_1VideoSampleEntry.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1SampleToGroup.html |    2 +-
 docs/d0/d7d/decryptor__source_8h_source.html  |   64 +-
 ...a_1_1media_1_1AesCbcEncryptor-members.html |    2 +-
 ...classshaka_1_1media_1_1Status-members.html |    2 +-
 .../d0/d93/classshaka_1_1media_1_1Status.html |    2 +-
 .../structshaka_1_1media_1_1mp4_1_1Movie.html |    2 +-
 ...ka_1_1media_1_1AACAudioSpecificConfig.html |    2 +-
 ...aka_1_1media_1_1RequestSigner-members.html |    2 +-
 ...uctshaka_1_1xml_1_1XmlDeleter-members.html |    2 +-
 .../d0/da6/stream__descriptor_8cc_source.html |    2 +-
 ...edia_1_1mp4_1_1SingleSegmentSegmenter.html |    2 +-
 ...classshaka_1_1media_1_1FixedKeySource.html |    2 +-
 ...webm_1_1MultiSegmentSegmenter-members.html |    2 +-
 ...edia_1_1mp4_1_1VTTEmptyCueBox-members.html |    2 +-
 ..._1xml_1_1AdaptationSetXmlNode-members.html |    2 +-
 .../classshaka_1_1media_1_1RsaPrivateKey.html |    8 +-
 ...aka_1_1media_1_1mp4_1_1CueSettingsBox.html |    2 +-
 ...media_1_1ProtectionSystemSpecificInfo.html |    2 +-
 .../dd6/webm__crypto__helpers_8cc_source.html |    2 +-
 ...lassshaka_1_1media_1_1AesCtrEncryptor.html |    2 +-
 .../dee/segmenter__test__base_8h_source.html  |    2 +-
 docs/d0/df3/packager__util_8cc_source.html    |  118 +-
 ...ia_1_1mp4_1_1AudioSampleEntry-members.html |    2 +-
 .../d0a/classshaka_1_1media_1_1MkvWriter.html |    2 +-
 .../d0a/structshaka_1_1media_1_1H264Sps.html  |    4 +-
 ...der__configuration__record_8cc_source.html |    2 +-
 ...media_1_1mp2t_1_1EsParserH264-members.html |    2 +-
 docs/d1/d13/status_8h_source.html             |    2 +-
 ...single__segment__segmenter_8cc_source.html |    2 +-
 docs/d1/d1d/muxer__flags_8cc_source.html      |    2 +-
 .../d1f/classshaka_1_1media_1_1KeySource.html |    2 +-
 ...1media_1_1mp4_1_1DecodingTimeIterator.html |    2 +-
 docs/d1/d27/key__fetcher_8h_source.html       |    2 +-
 ..._1media_1_1mp2t_1_1AdtsHeader-members.html |    2 +-
 docs/d1/d2a/decryptor__source_8cc_source.html |  213 +-
 ...media_1_1mp4_1_1DataReference-members.html |    2 +-
 .../structshaka_1_1media_1_1mp4_1_1Box.html   |    2 +-
 .../d2f/webvtt__media__parser_8cc_source.html |    2 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPes.html |    2 +-
 docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html |   22 +-
 ...tructshaka_1_1media_1_1SubsampleEntry.html |    2 +-
 docs/d1/d37/es__parser__h264_8h_source.html   |    2 +-
 .../d3b/mpd__generator__flags_8h_source.html  |    2 +-
 ...shaka_1_1media_1_1mp4_1_1MovieExtends.html |    2 +-
 .../d40/classshaka_1_1MpdWriter-members.html  |    2 +-
 .../decoding__time__iterator_8cc_source.html  |    2 +-
 .../d1/d48/text__track__config_8h_source.html |    2 +-
 ...a_1_1media_1_1OffsetByteQueue-members.html |    2 +-
 ...aka_1_1media_1_1EncryptionKey-members.html |    2 +-
 ..._1media_1_1mp4_1_1TrackFragmentHeader.html |    2 +-
 docs/d1/d70/vp8__parser_8cc_source.html       |    2 +-
 docs/d1/d72/language__utils_8cc_source.html   |    2 +-
 .../d74/mp2t__media__parser_8cc_source.html   |  864 ++++---
 ..._1media_1_1H265VideoSliceHeaderParser.html |    2 +-
 .../d7d/webm__video__client_8cc_source.html   |  345 ++-
 ...ia_1_1H265ReferencePictureSet-members.html |    2 +-
 docs/d1/d82/adts__constants_8h_source.html    |    2 +-
 ..._1_1media_1_1WebMParserClient-members.html |    2 +-
 ...1mp4_1_1KeyRotationFragmenter-members.html |    2 +-
 .../d8e/webm__audio__client_8cc_source.html   |    2 +-
 ...aka_1_1media_1_1H26xBitReader-members.html |    2 +-
 ...ssshaka_1_1media_1_1ByteQueue-members.html |    2 +-
 docs/d1/d9d/tracks__builder_8h_source.html    |    2 +-
 ..._1_1mp4_1_1CodecConfiguration-members.html |    2 +-
 ...assshaka_1_1media_1_1mp4_1_1BoxBuffer.html |    2 +-
 ...ia_1_1wvm_1_1DemuxStreamIdMediaSample.html |    2 +-
 ...1NalUnitToByteStreamConverter-members.html |    2 +-
 ..._1media_1_1VPCodecConfigurationRecord.html |    2 +-
 ...lassshaka_1_1media_1_1Demuxer-members.html |    4 +-
 ...a_1_1media_1_1mp4_1_1VideoMediaHeader.html |    2 +-
 ...oder__configuration__record_8h_source.html |    2 +-
 docs/d1/dc2/h26x__bit__reader_8h_source.html  |    2 +-
 .../dcb/encrypting__fragmenter_8h_source.html |    2 +-
 .../dd5/classshaka_1_1media_1_1Cluster.html   |    2 +-
 ...dia_1_1mp4_1_1DataInformation-members.html |    2 +-
 ...a_1_1media_1_1VideoStreamInfo-members.html |    2 +-
 ...position__offset__iterator_8cc_source.html |    2 +-
 ...sshaka_1_1media_1_1KeyFetcher-members.html |    2 +-
 ...sshaka_1_1xml_1_1AdaptationSetXmlNode.html |    4 +-
 ...rencePictureListModifications-members.html |    2 +-
 ..._1_1media_1_1ProgressListener-members.html |    2 +-
 ...assshaka_1_1media_1_1mp4_1_1BoxReader.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1SampleTable.html |    2 +-
 docs/d1/df0/aes__encryptor_8h_source.html     |    2 +-
 docs/d1/df3/structshaka_1_1MpdOptions.html    |    2 +-
 docs/d1/df5/nalu__reader_8cc_source.html      |    2 +-
 ...ia_1_1mp4_1_1VideoMediaHeader-members.html |    2 +-
 docs/d2/d02/timestamp_8h_source.html          |    2 +-
 ...assshaka_1_1media_1_1SeekHead-members.html |    2 +-
 .../d0f/classshaka_1_1MpdBuilder-members.html |    2 +-
 ...aka_1_1media_1_1wvm_1_1PrevSampleData.html |    2 +-
 ...aka_1_1media_1_1MuxerListener-members.html |    2 +-
 docs/d2/d17/ts__section__pat_8cc_source.html  |    2 +-
 .../d2/d23/threaded__io__file_8cc_source.html |    2 +-
 docs/d2/d24/packager__util_8h_source.html     |    6 +-
 ...media_1_1mp4_1_1KeyRotationFragmenter.html |    2 +-
 docs/d2/d30/tracks__builder_8cc_source.html   |    2 +-
 ...ideo__slice__header__parser_8h_source.html |    4 +-
 ...1_1media_1_1WidevineKeySource-members.html |    2 +-
 ...1_1mp4_1_1TrackFragmentHeader-members.html |    2 +-
 ...rogram__map__table__writer_8cc_source.html |    2 +-
 ...o__byte__stream__converter_8cc_source.html |    2 +-
 docs/d2/d4d/file_8h_source.html               |    2 +-
 .../d4f/structshaka_1_1Element-members.html   |    2 +-
 ...classshaka_1_1MockMpdNotifier-members.html |    2 +-
 ...ructshaka_1_1media_1_1H264SliceHeader.html |    4 +-
 ...ssshaka_1_1media_1_1KeySource-members.html |    2 +-
 ...assshaka_1_1SimpleMpdNotifier-members.html |    2 +-
 ...a_1_1H264ModificationOfPicNum-members.html |    2 +-
 .../d62/simple__mpd__notifier_8h_source.html  |   18 +-
 ...haka_1_1media_1_1mp4_1_1Movie-members.html |    2 +-
 ...sshaka_1_1media_1_1AesCryptor-members.html |    2 +-
 docs/d2/d6f/classBandwidthEstimator.html      |    2 +-
 ...ctshaka_1_1media_1_1mp4_1_1SchemeInfo.html |    2 +-
 ...ssshaka_1_1DashIopMpdNotifier-members.html |    2 +-
 .../d7b/simple__mpd__notifier_8cc_source.html |  273 +-
 ...ac__audio__specific__config_8h_source.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1CuePayloadBox.html |    2 +-
 ...ls__notify__muxer__listener_8h_source.html |    2 +-
 ...media_1_1mp4_1_1CuePayloadBox-members.html |    2 +-
 docs/d2/d92/box__reader_8h_source.html        |    2 +-
 ...ssshaka_1_1media_1_1mp2t_1_1PesPacket.html |    2 +-
 ...uctshaka_1_1media_1_1StreamDescriptor.html |    2 +-
 docs/d2/da6/threaded__io__file_8h_source.html |    2 +-
 docs/d2/da8/mp4_2segmenter_8cc_source.html    |  756 +++---
 ...haka_1_1media_1_1BufferWriter-members.html |    2 +-
 ...assshaka_1_1MockAdaptationSet-members.html |    2 +-
 docs/d2/dae/webm__muxer_8cc_source.html       |    2 +-
 ...media_1_1mp4_1_1SampleToGroup-members.html |    2 +-
 ...a_1_1media_1_1mp4_1_1FileType-members.html |    2 +-
 ...edia_1_1mp4_1_1CueSourceIDBox-members.html |    2 +-
 ...lassshaka_1_1media_1_1SegmentTestBase.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1Track-members.html |    2 +-
 .../structshaka_1_1MpdOptions-members.html    |    2 +-
 ...program__map__table__writer_8h_source.html |    2 +-
 ...a_1_1media_1_1mp4_1_1EditList-members.html |    2 +-
 ...edia_1_1webm_1_1MultiSegmentSegmenter.html |    2 +-
 docs/d2/dd6/mkv__writer_8h_source.html        |    2 +-
 ...lassshaka_1_1media_1_1WebMMediaParser.html |    2 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPmt.html |    2 +-
 docs/d2/de6/packager__main_8cc_source.html    | 1097 ++++----
 ...ka_1_1media_1_1TextStreamInfo-members.html |    2 +-
 ...shaka_1_1media_1_1mp4_1_1Edit-members.html |    2 +-
 .../de9/mock__muxer__listener_8h_source.html  |    2 +-
 docs/d2/deb/es__parser_8h_source.html         |    2 +-
 ...media_1_1mp2t_1_1TsSectionPes-members.html |    2 +-
 .../pes__packet__generator_8cc_source.html    |  172 +-
 ...a_1_1SegmentTestBase_1_1ClusterParser.html |    2 +-
 ...ssshaka_1_1media_1_1MkvWriter-members.html |    2 +-
 docs/d2/dfd/adts__header_8h_source.html       |    2 +-
 ..._1_1media_1_1mp4_1_1BoxReader-members.html |    2 +-
 ..._1_1mp4_1_1SyncSampleIterator-members.html |    2 +-
 .../classshaka_1_1media_1_1MediaParser.html   |    2 +-
 ...sshaka_1_1media_1_1mp2t_1_1AdtsHeader.html |    2 +-
 ..._1media_1_1LibcryptoThreading-members.html |    2 +-
 docs/d3/d15/udp__file__win_8cc_source.html    |    2 +-
 ...media_1_1mp2t_1_1TsSectionPat-members.html |    2 +-
 docs/d3/d19/io__cache_8h_source.html          |    2 +-
 ...deo__slice__header__parser_8cc_source.html |   10 +-
 ...uctshaka_1_1media_1_1mp4_1_1PrivFrame.html |    2 +-
 ...sshaka_1_1media_1_1LibcryptoThreading.html |    2 +-
 docs/d3/d56/decrypt__config_8cc_source.html   |    2 +-
 docs/d3/d61/classshaka_1_1media_1_1File.html  |    2 +-
 .../d3/d62/continuity__counter_8h_source.html |    2 +-
 docs/d3/d62/rcheck_8h_source.html             |    2 +-
 ...1media_1_1mp4_1_1DataEntryUrl-members.html |    2 +-
 ...lassshaka_1_1media_1_1WebMVideoClient.html |    4 +-
 .../d3/d6b/fixed__key__source_8cc_source.html |    2 +-
 ...lassshaka_1_1media_1_1mp2t_1_1TsMuxer.html |    2 +-
 docs/d3/d72/fixed__key__source_8h_source.html |    2 +-
 ...ssshaka_1_1media_1_1webm_1_1WebMMuxer.html |    2 +-
 .../classshaka_1_1media_1_1AesEncryptor.html  |    2 +-
 ...a_1_1mp4_1_1ChunkInfoIterator-members.html |    2 +-
 docs/d3/d76/muxer__flags_8h_source.html       |    2 +-
 ...dia_1_1mp4_1_1TextSampleEntry-members.html |    2 +-
 ...haka_1_1media_1_1RsaPublicKey-members.html |    2 +-
 ...lassshaka_1_1media_1_1WebMAudioClient.html |    2 +-
 docs/d3/d80/muxer__util_8h_source.html        |    2 +-
 ...haka_1_1media_1_1mp4_1_1SampleToChunk.html |    2 +-
 .../structshaka_1_1media_1_1FileCloser.html   |    2 +-
 .../d3/d8d/webm__audio__client_8h_source.html |    2 +-
 docs/d3/d90/ec3__audio__util_8cc_source.html  |    2 +-
 .../classshaka_1_1media_1_1H264Parser.html    |    4 +-
 docs/d3/da0/ec3__audio__util_8h_source.html   |    2 +-
 ...dia_1_1webm_1_1SingleSegmentSegmenter.html |    2 +-
 ...ctshaka_1_1media_1_1mp4_1_1SchemeType.html |    2 +-
 .../structshaka_1_1media_1_1mp4_1_1ID3v2.html |    2 +-
 ..._1_1media_1_1WebMWebVTTParser-members.html |    2 +-
 .../structshaka_1_1media_1_1mp4_1_1Track.html |    2 +-
 docs/d3/db6/webm__parser_8cc_source.html      |    2 +-
 docs/d3/dbc/seek__head_8cc_source.html        |    2 +-
 docs/d3/dbe/demuxer_8cc_source.html           |  451 ++--
 ...ructshaka_1_1media_1_1mp4_1_1EditList.html |    2 +-
 ...a_1_1media_1_1mp2t_1_1Mp2tMediaParser.html |    8 +-
 docs/d3/dd0/classshaka_1_1MpdNotifier.html    |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1SegmentType.html |    2 +-
 docs/d3/de4/seek__head_8h_source.html         |    2 +-
 ..._1_1media_1_1mp4_1_1BoxBuffer-members.html |    2 +-
 ...mp4_1_1SampleGroupDescription-members.html |    2 +-
 docs/d3/df1/box__reader_8cc_source.html       |    2 +-
 ...ssshaka_1_1media_1_1AesPatternCryptor.html |    2 +-
 ...2multi__segment__segmenter_8cc_source.html |    6 +-
 ...edia_1_1mp4_1_1MP4MediaParser-members.html |    2 +-
 .../d0b/classshaka_1_1media_1_1TextTrack.html |    2 +-
 ...1_1media_1_1WebVttMediaParser-members.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1EditListEntry.html |    2 +-
 ...lassshaka_1_1media_1_1AesCbcEncryptor.html |    2 +-
 ...ia_1_1mp4_1_1ChunkLargeOffset-members.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1ID3v2-members.html |    2 +-
 ...1media_1_1mp4_1_1WebVTTSourceLabelBox.html |    2 +-
 docs/d4/d37/io__cache_8cc_source.html         |    2 +-
 ...ructshaka_1_1media_1_1H264Sps-members.html |    2 +-
 ...pleAuxiliaryInformationOffset-members.html |    2 +-
 ...haka_1_1media_1_1H264WeightingFactors.html |    4 +-
 .../classshaka_1_1media_1_1Nalu-members.html  |    2 +-
 ...assshaka_1_1media_1_1WebMWebVTTParser.html |    2 +-
 ...aka_1_1media_1_1DecryptConfig-members.html |    2 +-
 ...lassshaka_1_1media_1_1UdpFile-members.html |    2 +-
 .../d70/classshaka_1_1DashIopMpdNotifier.html |   16 +-
 .../structshaka_1_1SegmentInfo-members.html   |    2 +-
 docs/d4/d87/nalu__reader_8h_source.html       |    2 +-
 ...dia_1_1HEVCDecoderConfigurationRecord.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1EC3Specific.html |    2 +-
 .../da7/segmenter__test__base_8cc_source.html |    2 +-
 ...a_1_1media_1_1mp4_1_1SampleEncryption.html |    2 +-
 ...a_1_1mp4_1_1CompactSampleSize-members.html |    2 +-
 docs/d4/db2/cluster__builder_8h_source.html   |    2 +-
 .../db4/classshaka_1_1MpdNotifierFactory.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1MediaHeader.html |    2 +-
 ...a_1_1mp2t_1_1AacProgramMapTableWriter.html |    2 +-
 docs/d4/dd3/bit__reader_8h_source.html        |    2 +-
 ...ka_1_1media_1_1mp4_1_1FullBox-members.html |    2 +-
 ...sshaka_1_1media_1_1MemoryFile-members.html |    2 +-
 docs/d4/dde/webvtt__util_8h_source.html       |    2 +-
 ...haka_1_1media_1_1mp4_1_1DataReference.html |    2 +-
 ...assshaka_1_1media_1_1ProgressListener.html |    2 +-
 ...VodMediaInfoDumpMuxerListener-members.html |    2 +-
 docs/d4/dec/hls__flags_8h_source.html         |    2 +-
 docs/d4/df5/request__signer_8cc_source.html   |    4 +-
 ...shaka_1_1media_1_1mp4_1_1SegmentIndex.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1AC3Specific.html |    2 +-
 .../dfd/structshaka_1_1media_1_1H265Sps.html  |    2 +-
 .../dff/webm__media__parser_8cc_source.html   |    2 +-
 ...ructshaka_1_1media_1_1mp4_1_1FileType.html |    2 +-
 ...aka_1_1media_1_1mp4_1_1OriginalFormat.html |    2 +-
 ...ructshaka_1_1media_1_1mp4_1_1CueIDBox.html |    2 +-
 ...ka_1_1media_1_1WebMInfoParser-members.html |    2 +-
 ..._1_1mp4_1_1ElementaryStreamDescriptor.html |    2 +-
 .../classshaka_1_1media_1_1ESDescriptor.html  |    2 +-
 .../producer__consumer__queue_8h_source.html  |    2 +-
 docs/d5/d1a/ts__section_8h_source.html        |    2 +-
 ...ia_1_1mp4_1_1TrackRunIterator-members.html |    2 +-
 docs/d5/d27/key__fetcher_8cc_source.html      |    2 +-
 ...aka_1_1media_1_1ProducerConsumerQueue.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1Media-members.html |    2 +-
 ...2single__segment__segmenter_8h_source.html |    2 +-
 ...media_1_1mp2t_1_1TsSectionPsi-members.html |    2 +-
 docs/d5/d4d/box_8cc_source.html               |    2 +-
 docs/d5/d52/ts__section__pes_8h_source.html   |    2 +-
 ...ampleAuxiliaryInformationSize-members.html |    2 +-
 ...esentationStateChangeListener-members.html |    2 +-
 ...ssshaka_1_1MockRepresentation-members.html |    2 +-
 .../d5c/continuity__counter_8cc_source.html   |    2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH265.html |    2 +-
 docs/d5/d63/network__util_8cc_source.html     |    2 +-
 ...media_1_1NalUnitToByteStreamConverter.html |    2 +-
 docs/d5/d6f/vlog__flags_8cc_source.html       |    2 +-
 ...der__configuration__record_8cc_source.html |    2 +-
 docs/d5/d7b/box__definitions_8h_source.html   |    2 +-
 ...a_1_1media_1_1mp4_1_1MediaInformation.html |    2 +-
 .../d89/widevine__key__source_8cc_source.html | 1186 +++++----
 ..._1_1media_1_1mp4_1_1CompositionOffset.html |    2 +-
 .../d8f/webm__cluster__parser_8cc_source.html |    4 +-
 docs/d5/d91/es__parser__adts_8cc_source.html  |    2 +-
 ...media_1_1mp4_1_1EditListEntry-members.html |    2 +-
 docs/d5/d98/encryptor_8cc_source.html         |    4 +-
 ...odec__configuration__record_8h_source.html |    2 +-
 ...H265ReferencePictureListModifications.html |    2 +-
 docs/d5/da4/aes__encryptor_8cc_source.html    |    4 +-
 ...a_1_1media_1_1H265ReferencePictureSet.html |    2 +-
 .../classshaka_1_1media_1_1StreamInfo.html    |    2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH264.html |    2 +-
 docs/d5/dba/ts__packet_8cc_source.html        |    2 +-
 .../dc1/webm__webvtt__parser_8cc_source.html  |    2 +-
 ...media_1_1mp4_1_1TrackFragment-members.html |    2 +-
 ...4_1_1SampleAuxiliaryInformationOffset.html |    2 +-
 docs/d5/dcf/rsa__key_8h_source.html           |   14 +-
 docs/d5/dda/ts__section__psi_8h_source.html   |    2 +-
 docs/d5/de0/bit__reader_8cc_source.html       |    2 +-
 ..._1media_1_1mp2t_1_1PesPacketGenerator.html |    4 +-
 ...assshaka_1_1media_1_1WebMParserClient.html |    2 +-
 ...der__configuration__record_8cc_source.html |    2 +-
 ...mp4_1_1WebVTTConfigurationBox-members.html |    2 +-
 docs/d5/def/ts__section__pmt_8h_source.html   |    2 +-
 ...ka_1_1media_1_1HlsNotifyMuxerListener.html |    2 +-
 ...shaka_1_1media_1_1MediaParser-members.html |    2 +-
 docs/d5/dfc/file_8cc_source.html              |    2 +-
 ...a_1_1media_1_1AesCbcDecryptor-members.html |    2 +-
 .../d09/aes__pattern__cryptor_8h_source.html  |    2 +-
 .../d6/d16/text__stream__info_8cc_source.html |    2 +-
 docs/d6/d17/es__parser__h264_8cc_source.html  |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1MovieHeader.html |    2 +-
 .../ts__packet__writer__util_8cc_source.html  |    2 +-
 ...1_1media_1_1VideoStreamInfoParameters.html |    2 +-
 .../d2e/mpd__notifier__util_8cc_source.html   |    6 +-
 ...ssshaka_1_1media_1_1TextTrack-members.html |    2 +-
 .../webm__content__encodings_8cc_source.html  |    2 +-
 .../d3b/chunk__info__iterator_8cc_source.html |    2 +-
 .../encrypting__fragmenter_8cc_source.html    |    2 +-
 ...2multi__segment__segmenter_8cc_source.html |    2 +-
 docs/d6/d55/aes__cryptor_8cc_source.html      |  258 +-
 ...edia_1_1AVCDecoderConfigurationRecord.html |    2 +-
 ...ion__system__specific__info_8h_source.html |    2 +-
 ...1_1VPCodecConfigurationRecord-members.html |    2 +-
 docs/d6/d6c/h26x__bit__reader_8cc_source.html |    2 +-
 docs/d6/d6e/ts__section__pes_8cc_source.html  |    2 +-
 docs/d6/d71/scoped__xml__ptr_8h_source.html   |    2 +-
 .../dash__iop__mpd__notifier_8h_source.html   |   20 +-
 ...1media_1_1mp4_1_1VTTAdditionalTextBox.html |    2 +-
 .../d7b/webm__tracks__parser_8h_source.html   |    2 +-
 ..._1media_1_1mp4_1_1AC3Specific-members.html |    2 +-
 .../d86/bandwidth__estimator_8cc_source.html  |    2 +-
 docs/d6/d8a/vp9__parser_8cc_source.html       |    2 +-
 ..._1_1RepresentationBaseXmlNode-members.html |    2 +-
 docs/d6/d9b/h264__parser_8h_source.html       |  671 ++---
 docs/d6/d9f/hls__flags_8cc_source.html        |    2 +-
 docs/d6/da0/ts__section__pat_8h_source.html   |    2 +-
 docs/d6/da3/mpd__builder_8h_source.html       |  807 +++---
 ...AVCDecoderConfigurationRecord-members.html |    2 +-
 ...iceHeader_1_1LongTermPicsInfo-members.html |    2 +-
 .../da9/classshaka_1_1media_1_1BitReader.html |    2 +-
 ...uctshaka_1_1media_1_1mp4_1_1VTTCueBox.html |    2 +-
 ...shaka_1_1media_1_1MediaStream-members.html |    2 +-
 ...lassshaka_1_1media_1_1VideoStreamInfo.html |    8 +-
 ..._1_1VideoStreamInfoParameters-members.html |    2 +-
 ...sParserH26x_1_1VideoSliceInfo-members.html |    2 +-
 ...media_1_1mp2t_1_1EsParserH26x-members.html |    2 +-
 docs/d6/dc8/mkv__writer_8cc_source.html       |    2 +-
 ...media_1_1mp4_1_1SampleEncryptionEntry.html |    2 +-
 ...ssshaka_1_1media_1_1VP9Parser-members.html |    2 +-
 ...ia_1_1mp4_1_1SegmentReference-members.html |    2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserAdts.html |    2 +-
 ...tructshaka_1_1media_1_1H264SEIMessage.html |    4 +-
 ...1_1media_1_1H265VuiParameters-members.html |    2 +-
 ...1_1media_1_1mp4_1_1CueTimeBox-members.html |    2 +-
 ...haka_1_1media_1_1VPxFrameInfo-members.html |    2 +-
 docs/d6/de8/local__file_8cc_source.html       |    2 +-
 docs/d6/de8/network__util_8h_source.html      |    2 +-
 docs/d6/de9/ts__segmenter_8cc_source.html     |    6 +-
 docs/d6/ded/ts__packet_8h_source.html         |    2 +-
 .../sync__sample__iterator_8cc_source.html    |    2 +-
 docs/d6/dff/classshaka_1_1media_1_1Nalu.html  |    2 +-
 ...edia_1_1mp4_1_1SampleGroupDescription.html |    2 +-
 ...a_1_1media_1_1mp4_1_1SoundMediaHeader.html |    2 +-
 ...xer__listener__test__helper_8h_source.html |    2 +-
 docs/d7/d12/media__parser_8h_source.html      |    2 +-
 docs/d7/d15/mpd__notifier_8h_source.html      |    2 +-
 ...ia_1_1mp4_1_1VideoSampleEntry-members.html |    2 +-
 .../d22/libcrypto__threading_8h_source.html   |    2 +-
 ...1_1media_1_1mp4_1_1SyncSampleIterator.html |    2 +-
 ...ructshaka_1_1media_1_1H265Sps-members.html |    2 +-
 ...p4_1_1CompositionTimeToSample-members.html |    2 +-
 ...a_1_1media_1_1ContentEncoding-members.html |    2 +-
 ...on__system__specific__info_8cc_source.html |    2 +-
 ...ctshaka_1_1media_1_1mp4_1_1SampleSize.html |    2 +-
 ...ia_1_1mp4_1_1SampleEncryption-members.html |    2 +-
 ...ka_1_1media_1_1WebMListParser-members.html |    2 +-
 ...H26xByteToUnitStreamConverter-members.html |    2 +-
 ...lassshaka_1_1media_1_1DecryptorSource.html |    4 +-
 .../classshaka_1_1media_1_1MediaSample.html   |    2 +-
 ..._1media_1_1mp4_1_1MediaHeader-members.html |    2 +-
 ...ka_1_1media_1_1H264SEIMessage-members.html |    2 +-
 .../d7a/classshaka_1_1media_1_1UdpFile.html   |    2 +-
 docs/d7/d7c/vlog__flags_8h_source.html        |    2 +-
 .../d7/d87/video__stream__info_8h_source.html |    8 +-
 ..._1H265SliceHeader_1_1LongTermPicsInfo.html |    2 +-
 docs/d7/d9d/progress__listener_8h_source.html |    2 +-
 .../da4/track__run__iterator_8h_source.html   |    2 +-
 ...uctshaka_1_1media_1_1mp4_1_1MediaData.html |    2 +-
 docs/d7/db0/mpd__writer_8h_source.html        |    2 +-
 ...media_1_1mp4_1_1SampleToChunk-members.html |    2 +-
 ...ka_1_1media_1_1mp4_1_1TextSampleEntry.html |    2 +-
 docs/d7/dc6/byte__queue_8h_source.html        |    2 +-
 .../d7/dd0/mpd__notifier__util_8h_source.html |    2 +-
 docs/d7/dd4/request__signer_8h_source.html    |    2 +-
 ...aka_1_1media_1_1mp4_1_1MP4MediaParser.html |    2 +-
 docs/d7/dd6/key__source_8cc_source.html       |    2 +-
 .../dda/classshaka_1_1media_1_1ByteQueue.html |    2 +-
 ...assshaka_1_1media_1_1RsaRequestSigner.html |    2 +-
 ...classshaka_1_1media_1_1HttpKeyFetcher.html |    2 +-
 ...1_1media_1_1mp4_1_1SampleToGroupEntry.html |    2 +-
 ...to__unit__stream__converter_8h_source.html |    2 +-
 docs/d7/dee/mpd__generator_8cc_source.html    |    2 +-
 .../d7/def/mp4__media__parser_8cc_source.html |    4 +-
 docs/d7/df9/byte__queue_8cc_source.html       |    2 +-
 ...edia_1_1H264ByteToUnitStreamConverter.html |    2 +-
 ...1_1media_1_1WebMClusterParser-members.html |    2 +-
 ..._1_1media_1_1mp2t_1_1TsWriter-members.html |    2 +-
 ..._1media_1_1mp4_1_1MovieHeader-members.html |    2 +-
 docs/d8/d0d/media__sample_8cc_source.html     |    2 +-
 ...shaka_1_1media_1_1mp4_1_1DecodingTime.html |    2 +-
 ..._1_1media_1_1mp4_1_1PrivFrame-members.html |    2 +-
 ...ssshaka_1_1media_1_1BitReader-members.html |    2 +-
 .../d14/classshaka_1_1media_1_1VP8Parser.html |    2 +-
 ...haka_1_1media_1_1MuxerOptions-members.html |    2 +-
 .../d19/bandwidth__estimator_8h_source.html   |    2 +-
 ...edia_1_1mp4_1_1WebVTTConfigurationBox.html |    2 +-
 ...ka_1_1media_1_1SubsampleEntry-members.html |    2 +-
 docs/d8/d28/es__parser__h265_8h_source.html   |    2 +-
 ..._content__encodings__client_8h_source.html |   77 +-
 ...1_1media_1_1StreamDescriptorCompareFn.html |    2 +-
 docs/d8/d4d/aes__decryptor_8h_source.html     |    2 +-
 ...a_1_1media_1_1mp4_1_1AudioSampleEntry.html |    2 +-
 .../classshaka_1_1media_1_1MediaStream.html   |    2 +-
 ...ka_1_1media_1_1ClusterBuilder-members.html |    2 +-
 ...ka_1_1media_1_1mp4_1_1DataInformation.html |    2 +-
 ...a_1_1media_1_1mp4_1_1Metadata-members.html |    2 +-
 .../classshaka_1_1media_1_1TracksBuilder.html |    2 +-
 ...assshaka_1_1media_1_1WebMTracksParser.html |    2 +-
 ...1media_1_1mp4_1_1MovieExtends-members.html |    2 +-
 docs/d8/d8e/classshaka_1_1AdaptationSet.html  |   26 +-
 ...a_1_1media_1_1AesCtrEncryptor-members.html |    2 +-
 ..._1_1media_1_1AesRequestSigner-members.html |    2 +-
 ...media_1_1H264DecRefPicMarking-members.html |    2 +-
 ...1_1mp4_1_1SubtitleMediaHeader-members.html |    2 +-
 docs/d8/d94/adts__constants_8cc_source.html   |    2 +-
 docs/d8/d94/pes__packet_8h_source.html        |    2 +-
 ..._1mp4_1_1VTTAdditionalTextBox-members.html |    2 +-
 docs/d8/d9a/fragmenter_8cc_source.html        |    2 +-
 .../d9c/webm__tracks__parser_8cc_source.html  |    6 +-
 docs/d8/d9f/udp__file_8h_source.html          |    2 +-
 ...a_1_1media_1_1DecryptorSource-members.html |    2 +-
 ...1_1media_1_1mp4_1_1SampleSize-members.html |    2 +-
 ...sshaka_1_1media_1_1NaluReader-members.html |    2 +-
 docs/d8/daa/stream__info_8h_source.html       |    2 +-
 docs/d8/daf/namespaceshaka.html               |    2 +-
 ...media_1_1mp4_1_1MultiSegmentSegmenter.html |    2 +-
 ...1_1WebMContentEncodingsClient-members.html |    2 +-
 ...p2t_1_1EsParserH26x_1_1VideoSliceInfo.html |    2 +-
 ...ctshaka_1_1media_1_1mp4_1_1CueTimeBox.html |    2 +-
 docs/d8/dca/ts__writer_8h_source.html         |    2 +-
 ...1media_1_1mp4_1_1DecodingTime-members.html |    2 +-
 ...1media_1_1mp4_1_1TrackExtends-members.html |    2 +-
 ...1_1media_1_1mp2t_1_1ContinuityCounter.html |    2 +-
 ...1mp4_1_1CencSampleEncryptionInfoEntry.html |    2 +-
 .../de1/classshaka_1_1SimpleMpdNotifier.html  |   16 +-
 .../de6/webm__crypto__helpers_8h_source.html  |    2 +-
 ..._1_1media_1_1mp2t_1_1EsParser-members.html |    2 +-
 ...media_1_1AudioTimestampHelper-members.html |    2 +-
 ...ssshaka_1_1media_1_1VPxParser-members.html |    2 +-
 ...single__segment__segmenter_8cc_source.html |    2 +-
 ...a_1_1media_1_1SegmentTestBase-members.html |    2 +-
 ...to__byte__stream__converter_8h_source.html |    2 +-
 ...media_1_1OnMediaEndParameters-members.html |    2 +-
 ...2single__segment__segmenter_8h_source.html |    2 +-
 docs/d9/d08/mock__mpd__builder_8h_source.html |   36 +-
 ...dia_1_1HlsNotifyMuxerListener-members.html |    2 +-
 .../classshaka_1_1media_1_1RsaPublicKey.html  |    8 +-
 .../classshaka_1_1media_1_1BufferReader.html  |    2 +-
 .../key__rotation__fragmenter_8cc_source.html |    4 +-
 ...haka_1_1media_1_1mp4_1_1MovieFragment.html |    2 +-
 ...haka_1_1media_1_1AesEncryptor-members.html |    2 +-
 ...assshaka_1_1media_1_1mp4_1_1Segmenter.html |    8 +-
 ...aka_1_1media_1_1TracksBuilder-members.html |    2 +-
 .../classshaka_1_1media_1_1File-members.html  |    2 +-
 .../webm__content__encodings_8h_source.html   |    2 +-
 ...aka_1_1media_1_1mp4_1_1VTTEmptyCueBox.html |    2 +-
 ...aka_1_1media_1_1mp4_1_1CueSourceIDBox.html |    2 +-
 ..._1_1media_1_1mp4_1_1ChunkInfoIterator.html |    2 +-
 ...media_1_1mp2t_1_1EsParserAdts-members.html |    2 +-
 ...ctshaka_1_1media_1_1H265VuiParameters.html |    2 +-
 ...a_1_1media_1_1H264SliceHeader-members.html |    2 +-
 docs/d9/d76/ts__muxer_8cc_source.html         |    2 +-
 ...aka_1_1media_1_1ClosureThread-members.html |    2 +-
 docs/d9/d86/limits_8h_source.html             |    2 +-
 ..._1media_1_1WebMContentEncodingsClient.html |    4 +-
 ...assshaka_1_1media_1_1AesRequestSigner.html |    2 +-
 ...1ProtectionSystemSpecificInfo-members.html |    2 +-
 docs/d9/d90/text__track_8h_source.html        |    2 +-
 docs/d9/d93/media__stream_8h_source.html      |    2 +-
 docs/d9/da4/stream__descriptor_8h_source.html |    2 +-
 ...ka_1_1media_1_1MpdNotifyMuxerListener.html |    2 +-
 .../structshaka_1_1media_1_1Cue-members.html  |    2 +-
 ..._1_1media_1_1mp4_1_1Segmenter-members.html |    2 +-
 ..._1_1CompositionOffsetIterator-members.html |    2 +-
 ...ntent__protection__element_8cc_source.html |    2 +-
 docs/d9/db9/muxer_8cc_source.html             |    2 +-
 .../classshaka_1_1media_1_1MemoryFile.html    |    2 +-
 ...haka_1_1media_1_1BufferReader-members.html |    2 +-
 ...1mp4_1_1SampleEncryptionEntry-members.html |    2 +-
 docs/d9/dc8/webm__constants_8cc_source.html   |    2 +-
 .../d9/dcc/webm__video__client_8h_source.html |    6 +-
 .../muxer__listener__internal_8cc_source.html |    2 +-
 .../de6/classshaka_1_1media_1_1LocalFile.html |    2 +-
 ...ka_1_1media_1_1FixedKeySource-members.html |    2 +-
 ...c__audio__specific__config_8cc_source.html |    2 +-
 ...p4_1_1TrackFragmentDecodeTime-members.html |    2 +-
 ...lassshaka_1_1media_1_1OffsetByteQueue.html |    2 +-
 ..._1_1media_1_1H264ModificationOfPicNum.html |    4 +-
 .../d04/audio__stream__info_8cc_source.html   |    2 +-
 ...assshaka_1_1media_1_1mp2t_1_1EsParser.html |    2 +-
 ...ructshaka_1_1media_1_1mp4_1_1Language.html |    2 +-
 ...ssshaka_1_1media_1_1mp2t_1_1TsSection.html |    2 +-
 .../key__rotation__fragmenter_8h_source.html  |    2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH26x.html |    2 +-
 docs/da/d23/ts__muxer_8h_source.html          |    2 +-
 docs/da/d24/h265__parser_8h_source.html       |   16 +-
 docs/da/d2a/text__stream__info_8h_source.html |    2 +-
 ...1_1media_1_1webm_1_1WebMMuxer-members.html |    2 +-
 ...ia_1_1mp4_1_1PixelAspectRatio-members.html |    2 +-
 ..._2multi__segment__segmenter_8h_source.html |    2 +-
 ...ructshaka_1_1ContentProtectionElement.html |    2 +-
 ...lassshaka_1_1media_1_1AudioStreamInfo.html |    2 +-
 ...1_1media_1_1mp4_1_1MovieExtendsHeader.html |    2 +-
 docs/da/d53/es__parser__h265_8cc_source.html  |    2 +-
 ..._1_1media_1_1mp4_1_1CompactSampleSize.html |    2 +-
 .../d5c/widevine__key__source_8h_source.html  |   16 +-
 ...1_1H264VideoSliceHeaderParser-members.html |    2 +-
 ...mp4_1_1SingleSegmentSegmenter-members.html |    2 +-
 ..._1_1H264ProgramMapTableWriter-members.html |    2 +-
 ...edia_1_1mp4_1_1AudioRollRecoveryEntry.html |    2 +-
 ...xed__key__encryption__flags_8h_source.html |    2 +-
 ...1media_1_1mp2t_1_1TsSegmenter-members.html |    2 +-
 docs/da/d88/mp4__muxer_8cc_source.html        |    2 +-
 ...a_1_1media_1_1WebMMediaParser-members.html |    2 +-
 docs/da/d8e/container__names_8cc_source.html  |    2 +-
 ...a_1_1mp4_1_1CompositionOffset-members.html |    2 +-
 ..._1media_1_1mp4_1_1EC3Specific-members.html |    2 +-
 ...ssshaka_1_1MpdNotifierFactory-members.html |    2 +-
 ...1_1media_1_1MockMuxerListener-members.html |    2 +-
 ...assshaka_1_1media_1_1mp2t_1_1TsPacket.html |    2 +-
 .../classshaka_1_1Representation-members.html |    2 +-
 ...a_1_1media_1_1mp4_1_1HandlerReference.html |    2 +-
 docs/da/dc3/status_8cc_source.html            |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1TrackHeader.html |    2 +-
 docs/da/dcb/es__descriptor_8h_source.html     |    2 +-
 .../structshaka_1_1media_1_1mp4_1_1Edit.html  |    2 +-
 docs/da/dd0/webm__info__parser_8h_source.html |    2 +-
 docs/da/dd1/fragmenter_8h_source.html         |    2 +-
 ..._1_1media_1_1mp2t_1_1TsPacket-members.html |    2 +-
 ...H264ByteToUnitStreamConverter-members.html |    2 +-
 ...ia_1_1mp2t_1_1Mp2tMediaParser-members.html |    2 +-
 ...media_1_1H264SEIRecoveryPoint-members.html |    2 +-
 ...ssshaka_1_1media_1_1WidevineKeySource.html |   22 +-
 ...a_1_1mp4_1_1SampleDescription-members.html |    2 +-
 .../da/de2/mock__mpd__builder_8cc_source.html |    2 +-
 ...ssshaka_1_1media_1_1WebMClusterParser.html |    2 +-
 ...1_1media_1_1mp4_1_1SchemeType-members.html |    2 +-
 ...a_1_1media_1_1AudioStreamInfo-members.html |    2 +-
 ...1media_1_1mp4_1_1ProtectionSchemeInfo.html |    2 +-
 ..._1media_1_1H264VideoSliceHeaderParser.html |    2 +-
 docs/da/df4/aes__decryptor_8cc_source.html    |    4 +-
 ..._1_1media_1_1mp4_1_1SampleDescription.html |    2 +-
 ...1_1media_1_1AesPatternCryptor-members.html |    2 +-
 ...ructshaka_1_1media_1_1H265SliceHeader.html |    2 +-
 ...1_1media_1_1mp4_1_1CodecConfiguration.html |    2 +-
 ...sshaka_1_1media_1_1H265Parser-members.html |    2 +-
 ...media_1_1H264WeightingFactors-members.html |    2 +-
 ..._1media_1_1mp4_1_1SubtitleMediaHeader.html |    2 +-
 ...lassshaka_1_1media_1_1mp4_1_1MP4Muxer.html |    2 +-
 ...to__unit__stream__converter_8h_source.html |    2 +-
 .../d31/track__run__iterator_8cc_source.html  |    2 +-
 ...1_1mp2t_1_1PesPacketGenerator-members.html |    2 +-
 ...dia_1_1VideoSliceHeaderParser-members.html |    2 +-
 ...pd__notify__muxer__listener_8h_source.html |    2 +-
 .../d4b/classshaka_1_1MockAdaptationSet.html  |    2 +-
 ...a_1_1mp4_1_1CompositionOffsetIterator.html |    2 +-
 .../db/d51/mp2t__media__parser_8h_source.html |   10 +-
 ..._single__segment__segmenter_8h_source.html |    2 +-
 .../d5a/classshaka_1_1media_1_1VP9Parser.html |    2 +-
 docs/db/d60/mpd__options_8h_source.html       |    2 +-
 .../d64/webvtt__media__parser_8h_source.html  |    2 +-
 ..._1media_1_1mp4_1_1SegmentType-members.html |    2 +-
 docs/db/d71/http__key__fetcher_8h_source.html |    2 +-
 ...EVCDecoderConfigurationRecord-members.html |    2 +-
 ...TwoPassSingleSegmentSegmenter-members.html |    2 +-
 ..._1_1mp2t_1_1ContinuityCounter-members.html |    2 +-
 docs/db/d7e/muxer__options_8cc_source.html    |    2 +-
 ...dia_1_1AACAudioSpecificConfig-members.html |    2 +-
 .../classshaka_1_1media_1_1NaluReader.html    |    2 +-
 docs/db/d8f/mp4__muxer_8h_source.html         |    2 +-
 ...classshaka_1_1media_1_1ClusterBuilder.html |    2 +-
 ...ssshaka_1_1media_1_1mp4_1_1Fragmenter.html |    2 +-
 ...a_1_1media_1_1mp4_1_1ChunkLargeOffset.html |    2 +-
 docs/db/d96/wvm__media__parser_8h_source.html |    2 +-
 .../da4/classBandwidthEstimator-members.html  |    2 +-
 docs/db/da6/memory__file_8h_source.html       |    2 +-
 ...classshaka_1_1media_1_1TextStreamInfo.html |    2 +-
 ...classshaka_1_1media_1_1WebMInfoParser.html |    2 +-
 ...ia_1_1mp4_1_1SoundMediaHeader-members.html |    2 +-
 ...CencSampleEncryptionInfoEntry-members.html |    2 +-
 ...haka_1_1media_1_1OnMediaEndParameters.html |    2 +-
 ...ka_1_1media_1_1mp4_1_1TrackEncryption.html |    2 +-
 .../dcb/classshaka_1_1media_1_1VPxParser.html |    2 +-
 ...1_1media_1_1webm_1_1Encryptor-members.html |    2 +-
 docs/db/dcd/classshaka_1_1MpdWriter.html      |    2 +-
 ..._1media_1_1mp4_1_1DTSSpecific-members.html |    2 +-
 ...edia_1_1VodMediaInfoDumpMuxerListener.html |    2 +-
 .../dd2/chunk__info__iterator_8h_source.html  |    2 +-
 .../dd9/sync__sample__iterator_8h_source.html |    2 +-
 docs/db/dde/h265__parser_8cc_source.html      | 2166 ++++++++--------
 .../audio__timestamp__helper_8cc_source.html  |    2 +-
 docs/db/dee/pes__packet_8cc_source.html       |    2 +-
 ...a_1_1media_1_1H265SliceHeader-members.html |    2 +-
 ...lassshaka_1_1media_1_1Cluster-members.html |    2 +-
 docs/db/df6/muxer_8h_source.html              |    2 +-
 ...edia_1_1H265ByteToUnitStreamConverter.html |    2 +-
 docs/db/dfb/mpd__utils_8cc_source.html        |    6 +-
 ...d__notify__muxer__listener_8cc_source.html |    2 +-
 ..._1_1media_1_1mp4_1_1ChunkInfo-members.html |    2 +-
 ...lassshaka_1_1media_1_1IoCache-members.html |    2 +-
 ...edia_1_1mp2t_1_1ProgramMapTableWriter.html |    2 +-
 ...sshaka_1_1media_1_1StreamInfo-members.html |    2 +-
 ...haka_1_1media_1_1ESDescriptor-members.html |    2 +-
 .../d16/classshaka_1_1media_1_1SeekHead.html  |    2 +-
 ...aka_1_1media_1_1wvm_1_1WvmMediaParser.html |    2 +-
 ..._1mp4_1_1ProtectionSchemeInfo-members.html |    2 +-
 docs/dc/d19/box_8h_source.html                |    2 +-
 .../dash__iop__mpd__notifier_8cc_source.html  |  585 ++---
 ...ed__key__encryption__flags_8cc_source.html |    2 +-
 .../d3c/webm__cluster__parser_8h_source.html  |    2 +-
 docs/dc/d3f/key__source_8h_source.html        |    2 +-
 .../classshaka_1_1xml_1_1XmlNode-members.html |    2 +-
 .../classshaka_1_1media_1_1BufferWriter.html  |    2 +-
 ...rotectionSystemSpecificHeader-members.html |    2 +-
 ..._1media_1_1mp4_1_1TrackHeader-members.html |    2 +-
 ...o__unit__stream__converter_8cc_source.html |    6 +-
 .../decoding__time__iterator_8h_source.html   |    2 +-
 docs/dc/d53/webm_2segmenter_8cc_source.html   |   10 +-
 ...haka_1_1media_1_1H264DecRefPicMarking.html |    4 +-
 .../dc/d58/webm__media__parser_8h_source.html |    2 +-
 .../dc/d5c/classshaka_1_1MockMpdNotifier.html |    2 +-
 ...edia_1_1mp4_1_1CueSettingsBox-members.html |    2 +-
 ...1_1media_1_1webm_1_1Segmenter-members.html |    2 +-
 ...1_1media_1_1mp2t_1_1TsSection-members.html |    2 +-
 ...ssshaka_1_1media_1_1MockMuxerListener.html |    2 +-
 docs/dc/d7b/closure__thread_8cc_source.html   |    2 +-
 docs/dc/d7b/h264__parser_8cc_source.html      | 2234 ++++++++---------
 ...1_1ElementaryStreamDescriptor-members.html |    2 +-
 ..._1media_1_1mp4_1_1MovieFragmentHeader.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1DTSSpecific.html |    2 +-
 docs/dc/da1/classshaka_1_1MpdBuilder.html     |   16 +-
 ...lassshaka_1_1media_1_1ContentEncoding.html |    2 +-
 ...tshaka_1_1media_1_1FileCloser-members.html |    2 +-
 docs/dc/dbf/box__buffer_8h_source.html        |    2 +-
 ...1xml_1_1RepresentationXmlNode-members.html |    2 +-
 ...classshaka_1_1media_1_1WebMListParser.html |    2 +-
 docs/dc/dd9/rsa__key_8cc_source.html          |  448 ++--
 .../structshaka_1_1media_1_1mp4_1_1Media.html |    2 +-
 docs/dc/ddf/udp__file__posix_8cc_source.html  |    2 +-
 docs/dc/de1/structshaka_1_1SegmentInfo.html   |    2 +-
 ...1_1media_1_1mp4_1_1Fragmenter-members.html |    2 +-
 ...to__unit__stream__converter_8h_source.html |    2 +-
 docs/dc/dec/ts__section__pmt_8cc_source.html  |    2 +-
 .../classshaka_1_1media_1_1ClosureThread.html |    2 +-
 ...ssshaka_1_1media_1_1WebVttMediaParser.html |    2 +-
 ...1media_1_1mp4_1_1EncryptingFragmenter.html |    2 +-
 ...ebm_1_1SingleSegmentSegmenter-members.html |    2 +-
 ...ia_1_1mp4_1_1TrackFragmentRun-members.html |    2 +-
 docs/dc/df8/closure__thread_8h_source.html    |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1ChunkOffset.html |    2 +-
 docs/dd/d11/mpd__builder_8cc_source.html      | 1972 ++++++++-------
 docs/dd/d12/mpd__writer_8cc_source.html       |    4 +-
 ...mp4_1_1SampleAuxiliaryInformationSize.html |    2 +-
 .../d17/classshaka_1_1media_1_1Demuxer.html   |   23 +-
 docs/dd/d18/es__parser__adts_8h_source.html   |    2 +-
 .../d19/video__stream__info_8cc_source.html   |  159 +-
 .../dd/d30/wvm__media__parser_8cc_source.html |    2 +-
 docs/dd/d3b/mp4_2segmenter_8h_source.html     |   14 +-
 ...ctshaka_1_1media_1_1mp4_1_1SyncSample.html |    2 +-
 docs/dd/d42/encryptor_8h_source.html          |    2 +-
 docs/dd/d46/webm__parser_8h_source.html       |    2 +-
 ...media_1_1mp4_1_1MovieFragment-members.html |    2 +-
 ...m_1_1DemuxStreamIdMediaSample-members.html |    2 +-
 ...widevine__encryption__flags_8h_source.html |    2 +-
 ...media_1_1mp2t_1_1EsParserH265-members.html |    2 +-
 ...1_1media_1_1mp4_1_1SchemeInfo-members.html |    2 +-
 ...1_1media_1_1mp4_1_1SyncSample-members.html |    2 +-
 docs/dd/d65/vp8__parser_8h_source.html        |    2 +-
 ...o__unit__stream__converter_8cc_source.html |    2 +-
 ...1_1H265VideoSliceHeaderParser-members.html |    2 +-
 ...a_1_1media_1_1mp4_1_1PixelAspectRatio.html |    2 +-
 .../classshaka_1_1media_1_1MuxerListener.html |    2 +-
 .../d7c/classshaka_1_1media_1_1IoCache.html   |    2 +-
 docs/dd/d80/media__sample_8h_source.html      |    2 +-
 docs/dd/d87/memory__file_8cc_source.html      |    2 +-
 .../d88/pes__packet__generator_8h_source.html |  130 +-
 docs/dd/d8c/file__test__util_8h_source.html   |    2 +-
 ...1media_1_1mp4_1_1SegmentIndex-members.html |    2 +-
 .../ts__packet__writer__util_8h_source.html   |    2 +-
 .../audio__timestamp__helper_8h_source.html   |    2 +-
 ...a_1_1media_1_1mp4_1_1SegmentReference.html |    2 +-
 .../classshaka_1_1MpdNotifier-members.html    |    2 +-
 .../da4/structshaka_1_1xml_1_1XmlDeleter.html |    2 +-
 ...webm_1_1TwoPassSingleSegmentSegmenter.html |    2 +-
 ...info__dump__muxer__listener_8h_source.html |    2 +-
 docs/dd/dab/webm__muxer_8h_source.html        |    2 +-
 ..._1mp4_1_1WebVTTSourceLabelBox-members.html |    2 +-
 ...a_1_1media_1_1WebMAudioClient-members.html |    2 +-
 ..._1media_1_1mp4_1_1SampleTable-members.html |    2 +-
 ...a_1_1xml_1_1RepresentationBaseXmlNode.html |    2 +-
 docs/dd/dbc/buffer__reader_8cc_source.html    |    2 +-
 ...structshaka_1_1media_1_1EncryptionKey.html |    2 +-
 ...dia_1_1mp4_1_1TrackEncryption-members.html |    2 +-
 .../dbf/webm__webvtt__parser_8h_source.html   |    2 +-
 ...tructshaka_1_1media_1_1mp4_1_1FullBox.html |    2 +-
 ...edia_1_1ProducerConsumerQueue-members.html |    2 +-
 ...ssshaka_1_1media_1_1webm_1_1Segmenter.html |    2 +-
 ...edia_1_1mp4_1_1OriginalFormat-members.html |    2 +-
 docs/dd/dce/structshaka_1_1media_1_1Cue.html  |    2 +-
 docs/dd/dd2/buffer__writer_8h_source.html     |    2 +-
 docs/dd/dd3/buffer__writer_8cc_source.html    |    2 +-
 ...a_1_1media_1_1WebMVideoClient-members.html |    2 +-
 .../dd8/mock__muxer__listener_8cc_source.html |    2 +-
 ...tshaka_1_1media_1_1mp4_1_1Box-members.html |    2 +-
 ...ka_1_1media_1_1VideoSliceHeaderParser.html |    2 +-
 ...ructshaka_1_1media_1_1H265Pps-members.html |    2 +-
 docs/dd/de7/xml__node_8h_source.html          |   34 +-
 docs/dd/dee/box__definitions_8cc_source.html  |    2 +-
 ..._2multi__segment__segmenter_8h_source.html |    2 +-
 ...a_1_1media_1_1mp4_1_1TrackFragmentRun.html |    2 +-
 ...ructshaka_1_1media_1_1mp4_1_1Metadata.html |    2 +-
 docs/de/d0f/local__file_8h_source.html        |    2 +-
 docs/de/d12/container__names_8h_source.html   |    2 +-
 docs/de/d13/ts__writer_8cc_source.html        |    2 +-
 docs/de/d15/media__stream_8cc_source.html     |   10 +-
 ...a_1_1media_1_1TextTrackConfig-members.html |    2 +-
 docs/de/d17/cluster__builder_8cc_source.html  |    2 +-
 ...edia_1_1wvm_1_1WvmMediaParser-members.html |    2 +-
 ...single__segment__segmenter_8cc_source.html |    2 +-
 .../d22/aes__pattern__cryptor_8cc_source.html |    4 +-
 ..._1_1mp2t_1_1H264ProgramMapTableWriter.html |    2 +-
 ...shaka_1_1media_1_1mp4_1_1TrackExtends.html |    2 +-
 ..._1_1media_1_1WebMTracksParser-members.html |    2 +-
 .../d33/structshaka_1_1media_1_1H265Pps.html  |    2 +-
 .../de/d34/offset__byte__queue_8h_source.html |    2 +-
 ...o__unit__stream__converter_8cc_source.html |    2 +-
 docs/de/d3c/macros_8h_source.html             |    2 +-
 docs/de/d3e/buffer__reader_8h_source.html     |    2 +-
 ...sshaka_1_1media_1_1H264Parser-members.html |    2 +-
 ...1_1media_1_1mp2t_1_1PesPacket-members.html |    2 +-
 .../classshaka_1_1media_1_1DecryptConfig.html |    2 +-
 .../muxer__listener__internal_8h_source.html  |    2 +-
 docs/de/d52/classshaka_1_1Representation.html |   22 +-
 ...a_1_1media_1_1mp4_1_1Language-members.html |    2 +-
 docs/de/d5b/adts__header_8cc_source.html      |    2 +-
 docs/de/d5c/mpd__flags_8h_source.html         |    2 +-
 ...mp2t_1_1ProgramMapTableWriter-members.html |    2 +-
 ...assshaka_1_1media_1_1mp2t_1_1TsWriter.html |    2 +-
 ..._1_1mp4_1_1SampleToGroupEntry-members.html |    2 +-
 docs/de/d6e/language__utils_8h_source.html    |    2 +-
 .../de/d70/http__key__fetcher_8cc_source.html |    2 +-
 ...content__encodings__client_8cc_source.html |  515 ++--
 docs/de/d7b/mp4__media__parser_8h_source.html |    2 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPsi.html |    2 +-
 ...ox__definitions__comparison_8h_source.html |    2 +-
 ...ssshaka_1_1media_1_1LocalFile-members.html |    2 +-
 ...edia_1_1wvm_1_1PrevSampleData-members.html |    2 +-
 ...1_1mp4_1_1MovieFragmentHeader-members.html |    2 +-
 ...ssshaka_1_1media_1_1VP8Parser-members.html |    2 +-
 docs/de/da9/structshaka_1_1Element.html       |    2 +-
 docs/de/dab/es__parser__h26x_8cc_source.html  |    2 +-
 docs/de/dad/validate__flag_8cc_source.html    |    2 +-
 ...lassshaka_1_1media_1_1TextTrackConfig.html |    2 +-
 .../classshaka_1_1media_1_1H26xBitReader.html |    2 +-
 docs/de/dc1/demuxer_8h_source.html            |  106 +-
 .../classshaka_1_1media_1_1H265Parser.html    |   12 +-
 ..._1mp4_1_1DecodingTimeToSample-members.html |    2 +-
 docs/de/dcb/ts__segmenter_8h_source.html      |    2 +-
 .../dcc/mock__mpd__notifier_8cc_source.html   |    2 +-
 docs/de/dcf/file__closer_8h_source.html       |    2 +-
 ...ontent__protection__element_8h_source.html |    2 +-
 ...er__listener__test__helper_8cc_source.html |    2 +-
 .../classshaka_1_1media_1_1Muxer-members.html |    2 +-
 ...shaka_1_1media_1_1mp2t_1_1TsSegmenter.html |    2 +-
 ..._1_1media_1_1mp4_1_1MediaData-members.html |    2 +-
 ..._1media_1_1DecoderConfigurationRecord.html |    2 +-
 ...a_1_1media_1_1mp4_1_1MP4Muxer-members.html |    2 +-
 .../de4/structshaka_1_1media_1_1H264Pps.html  |    4 +-
 ...edia_1_1H26xByteToUnitStreamConverter.html |    2 +-
 ...1media_1_1mp4_1_1DecodingTimeToSample.html |    2 +-
 ...a_1_1media_1_1mp4_1_1TrackRunIterator.html |    2 +-
 ...ssshaka_1_1media_1_1webm_1_1Encryptor.html |    2 +-
 docs/de/dfa/muxer__listener_8h_source.html    |    2 +-
 ...shaka_1_1media_1_1mp4_1_1OpusSpecific.html |    2 +-
 docs/de/dfd/stream__info_8cc_source.html      |    2 +-
 ...dec__configuration__record_8cc_source.html |    2 +-
 .../d1a/offset__byte__queue_8cc_source.html   |    2 +-
 ...shaka_1_1media_1_1MediaSample-members.html |    2 +-
 ...mposition__offset__iterator_8h_source.html |    2 +-
 ...mentTestBase_1_1ClusterParser-members.html |    2 +-
 docs/df/d22/validate__flag_8h_source.html     |    2 +-
 ..._1mp4_1_1DecodingTimeIterator-members.html |    2 +-
 ...lassshaka_1_1media_1_1AesCbcDecryptor.html |    2 +-
 docs/df/d31/muxer__util_8cc_source.html       |    2 +-
 .../df/d32/audio__stream__info_8h_source.html |    2 +-
 .../classshaka_1_1AdaptationSet-members.html  |    2 +-
 ...uctshaka_1_1media_1_1mp4_1_1ChunkInfo.html |    2 +-
 ..._1_1mp4_1_1MovieExtendsHeader-members.html |    2 +-
 .../classshaka_1_1media_1_1RequestSigner.html |    2 +-
 docs/df/d46/classshaka_1_1media_1_1Muxer.html |    2 +-
 ...ka_1_1media_1_1ThreadedIoFile-members.html |    2 +-
 ...t_1_1AacProgramMapTableWriter-members.html |    2 +-
 ...aka_1_1media_1_1RsaPrivateKey-members.html |    2 +-
 ..._1mp4_1_1EncryptingFragmenter-members.html |    2 +-
 docs/df/d60/classshaka_1_1MockMpdBuilder.html |    2 +-
 ...mp4_1_1AudioRollRecoveryEntry-members.html |    2 +-
 .../classshaka_1_1media_1_1KeyFetcher.html    |    2 +-
 .../classshaka_1_1MockMpdBuilder-members.html |    2 +-
 ...1media_1_1mp4_1_1OpusSpecific-members.html |    2 +-
 ...dia_1_1mp4_1_1CompositionTimeToSample.html |    2 +-
 ...haka_1_1media_1_1mp4_1_1TrackFragment.html |    2 +-
 .../df/d7d/webm__info__parser_8cc_source.html |    2 +-
 ...1_1DecoderConfigurationRecord-members.html |    2 +-
 .../classshaka_1_1media_1_1AesCryptor.html    |   10 +-
 ...shaka_1_1media_1_1mp4_1_1DataEntryUrl.html |    2 +-
 docs/df/d8a/vp9__parser_8h_source.html        |    2 +-
 docs/df/d8a/vpx__parser_8h_source.html        |    2 +-
 ...1mp4_1_1MultiSegmentSegmenter-members.html |    2 +-
 docs/df/d8d/es__parser__h26x_8h_source.html   |    2 +-
 ..._1_1RepresentationStateChangeListener.html |    4 +-
 docs/df/d96/xml__node_8cc_source.html         |  765 +++---
 ...dia_1_1mp4_1_1TrackFragmentDecodeTime.html |    2 +-
 ...shaka_1_1xml_1_1RepresentationXmlNode.html |   10 +-
 ..._1media_1_1mp4_1_1ChunkOffset-members.html |    2 +-
 ...a_1_1media_1_1mp4_1_1CueIDBox-members.html |    2 +-
 docs/df/dad/decrypt__config_8h_source.html    |    2 +-
 ..._1_1media_1_1StreamDescriptor-members.html |    2 +-
 ...oder__configuration__record_8h_source.html |    2 +-
 docs/df/dd2/mpd__utils_8h_source.html         |    2 +-
 ...ructshaka_1_1media_1_1H264Pps-members.html |    2 +-
 docs/df/ddc/webm_2segmenter_8h_source.html    |    2 +-
 docs/df/dde/ts__section__psi_8cc_source.html  |    2 +-
 ...haka_1_1media_1_1H264SEIRecoveryPoint.html |    4 +-
 .../de3/text__track__config_8cc_source.html   |    2 +-
 docs/df/de9/segment__info_8h_source.html      |    2 +-
 ...a_1_1ContentProtectionElement-members.html |    2 +-
 .../dir_0494b8c96e3190a776d2b97ade9c8ddf.html |    2 +-
 .../dir_2618cd273dea54f184e42d7a562af818.html |    2 +-
 .../dir_279fd47bebb21302c25cfb685e84c359.html |    2 +-
 .../dir_2eceb70145328c029a5f43350007537a.html |    2 +-
 .../dir_39dc0668bd5a501998f94e8b4e546c71.html |    2 +-
 .../dir_3e9291fd7a18fdecc763294cb2628910.html |    2 +-
 .../dir_49627ef5ef0630f6cf11dd06344c4cf0.html |    2 +-
 .../dir_5039d854a18988ed1f1dbebc120ffbf7.html |    2 +-
 .../dir_65f7acfa8cf3a5f1edc11faa2428b914.html |    2 +-
 .../dir_679a6f4e9fa092b388fc986148018f2a.html |    2 +-
 .../dir_7f5e01ba7faf319a30cabd201b6ef121.html |    2 +-
 .../dir_89dd766eb2df7d7257dbe806a34404af.html |    2 +-
 .../dir_aa73376d632f252584a1c0dfbefab2c4.html |    2 +-
 .../dir_c6ada2450b25ab5438a4dba6c9b890af.html |    2 +-
 .../dir_d422163b96683743ed3963d4aac17747.html |    2 +-
 .../dir_eeaeb49ac3913fcfb450d3ce9cc0141b.html |    2 +-
 .../dir_f7dcbe7025bbacfc4b9a7dff6ad41d72.html |    2 +-
 docs/files.html                               |    2 +-
 docs/functions.html                           |    2 +-
 docs/functions_b.html                         |    2 +-
 docs/functions_c.html                         |    2 +-
 docs/functions_d.html                         |    2 +-
 docs/functions_e.html                         |    2 +-
 docs/functions_enum.html                      |    2 +-
 docs/functions_eval.html                      |    2 +-
 docs/functions_f.html                         |    2 +-
 docs/functions_func.html                      |    2 +-
 docs/functions_func_b.html                    |    2 +-
 docs/functions_func_c.html                    |    2 +-
 docs/functions_func_d.html                    |    2 +-
 docs/functions_func_e.html                    |    2 +-
 docs/functions_func_f.html                    |    2 +-
 docs/functions_func_g.html                    |    2 +-
 docs/functions_func_h.html                    |    2 +-
 docs/functions_func_i.html                    |    2 +-
 docs/functions_func_k.html                    |    2 +-
 docs/functions_func_l.html                    |    2 +-
 docs/functions_func_m.html                    |    2 +-
 docs/functions_func_n.html                    |    2 +-
 docs/functions_func_o.html                    |    2 +-
 docs/functions_func_p.html                    |    2 +-
 docs/functions_func_r.html                    |    2 +-
 docs/functions_func_s.html                    |    4 +-
 docs/functions_func_t.html                    |    2 +-
 docs/functions_func_u.html                    |    2 +-
 docs/functions_func_v.html                    |    2 +-
 docs/functions_func_w.html                    |    2 +-
 docs/functions_func_x.html                    |    2 +-
 docs/functions_func_~.html                    |    2 +-
 docs/functions_g.html                         |    2 +-
 docs/functions_h.html                         |    2 +-
 docs/functions_i.html                         |    2 +-
 docs/functions_k.html                         |    2 +-
 docs/functions_l.html                         |    2 +-
 docs/functions_m.html                         |    2 +-
 docs/functions_n.html                         |    2 +-
 docs/functions_o.html                         |    2 +-
 docs/functions_p.html                         |    2 +-
 docs/functions_r.html                         |    2 +-
 docs/functions_s.html                         |    4 +-
 docs/functions_t.html                         |    2 +-
 docs/functions_type.html                      |    2 +-
 docs/functions_u.html                         |    2 +-
 docs/functions_v.html                         |    2 +-
 docs/functions_vars.html                      |    2 +-
 docs/functions_w.html                         |    2 +-
 docs/functions_x.html                         |    2 +-
 docs/functions_~.html                         |    2 +-
 docs/hierarchy.html                           |    2 +-
 docs/index.html                               |    2 +-
 docs/namespacemembers.html                    |    2 +-
 docs/namespacemembers_func.html               |    2 +-
 docs/namespaces.html                          |    2 +-
 docs/search/all_10.js                         |    2 +-
 docs/search/functions_10.js                   |    2 +-
 945 files changed, 9346 insertions(+), 9415 deletions(-)

diff --git a/docs/annotated.html b/docs/annotated.html
index 30018cc308..ef73ec0b79 100644
--- a/docs/annotated.html
+++ b/docs/annotated.html
@@ -372,7 +372,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/classes.html b/docs/classes.html
index 4d9accbe3f..e68c634263 100644
--- a/docs/classes.html
+++ b/docs/classes.html
@@ -179,7 +179,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d00/structshaka_1_1media_1_1mp4_1_1HandlerReference-members.html b/docs/d0/d00/structshaka_1_1media_1_1mp4_1_1HandlerReference-members.html
index 0e870c3e3e..074c8bfdab 100644
--- a/docs/d0/d00/structshaka_1_1media_1_1mp4_1_1HandlerReference-members.html
+++ b/docs/d0/d00/structshaka_1_1media_1_1mp4_1_1HandlerReference-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d04/classshaka_1_1media_1_1RsaRequestSigner-members.html b/docs/d0/d04/classshaka_1_1media_1_1RsaRequestSigner-members.html
index ed73b867de..ed2a42d906 100644
--- a/docs/d0/d04/classshaka_1_1media_1_1RsaRequestSigner-members.html
+++ b/docs/d0/d04/classshaka_1_1media_1_1RsaRequestSigner-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d06/mpd__flags_8cc_source.html b/docs/d0/d06/mpd__flags_8cc_source.html
index 4421f45251..7633112931 100644
--- a/docs/d0/d06/mpd__flags_8cc_source.html
+++ b/docs/d0/d06/mpd__flags_8cc_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d0e/classshaka_1_1media_1_1HttpKeyFetcher-members.html b/docs/d0/d0e/classshaka_1_1media_1_1HttpKeyFetcher-members.html
index e186d316d1..e53f5f242b 100644
--- a/docs/d0/d0e/classshaka_1_1media_1_1HttpKeyFetcher-members.html
+++ b/docs/d0/d0e/classshaka_1_1media_1_1HttpKeyFetcher-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d0e/hevc__decoder__configuration__record_8h_source.html b/docs/d0/d0e/hevc__decoder__configuration__record_8h_source.html
index a7aa60a672..b1b766639c 100644
--- a/docs/d0/d0e/hevc__decoder__configuration__record_8h_source.html
+++ b/docs/d0/d0e/hevc__decoder__configuration__record_8h_source.html
@@ -138,7 +138,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d0e/muxer__options_8h_source.html b/docs/d0/d0e/muxer__options_8h_source.html
index 1b1999a7a2..22bac74bc7 100644
--- a/docs/d0/d0e/muxer__options_8h_source.html
+++ b/docs/d0/d0e/muxer__options_8h_source.html
@@ -152,7 +152,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d0f/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt-members.html b/docs/d0/d0f/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt-members.html
index 15bd011f76..be8942ad97 100644
--- a/docs/d0/d0f/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt-members.html
+++ b/docs/d0/d0f/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d11/structshaka_1_1media_1_1VPxFrameInfo.html b/docs/d0/d11/structshaka_1_1media_1_1VPxFrameInfo.html
index 47161b8350..1a83a11917 100644
--- a/docs/d0/d11/structshaka_1_1media_1_1VPxFrameInfo.html
+++ b/docs/d0/d11/structshaka_1_1media_1_1VPxFrameInfo.html
@@ -121,7 +121,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>height</b></td></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d1e/classshaka_1_1media_1_1H265ByteToUnitStreamConverter-members.html b/docs/d0/d1e/classshaka_1_1media_1_1H265ByteToUnitStreamConverter-members.html
index 1375191dbd..2b71e5eb1a 100644
--- a/docs/d0/d1e/classshaka_1_1media_1_1H265ByteToUnitStreamConverter-members.html
+++ b/docs/d0/d1e/classshaka_1_1media_1_1H265ByteToUnitStreamConverter-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d1f/structshaka_1_1media_1_1mp4_1_1VTTCueBox-members.html b/docs/d0/d1f/structshaka_1_1media_1_1mp4_1_1VTTCueBox-members.html
index b52afd6a13..c3a5ce8fd2 100644
--- a/docs/d0/d1f/structshaka_1_1media_1_1mp4_1_1VTTCueBox-members.html
+++ b/docs/d0/d1f/structshaka_1_1media_1_1mp4_1_1VTTCueBox-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html b/docs/d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html
index 3e337294a8..926194c957 100644
--- a/docs/d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html
+++ b/docs/d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html
@@ -155,7 +155,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>Reset</b> () override
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d27/structshaka_1_1media_1_1MuxerOptions.html b/docs/d0/d27/structshaka_1_1media_1_1MuxerOptions.html
index e2171890db..8163c32a8a 100644
--- a/docs/d0/d27/structshaka_1_1media_1_1MuxerOptions.html
+++ b/docs/d0/d27/structshaka_1_1media_1_1MuxerOptions.html
@@ -291,7 +291,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>webm_subsample_encryp
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d30/mock__mpd__notifier_8h_source.html b/docs/d0/d30/mock__mpd__notifier_8h_source.html
index 7f2f733a4f..afc7812cb2 100644
--- a/docs/d0/d30/mock__mpd__notifier_8h_source.html
+++ b/docs/d0/d30/mock__mpd__notifier_8h_source.html
@@ -148,7 +148,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d32/mp2t__common_8h_source.html b/docs/d0/d32/mp2t__common_8h_source.html
index 710b9125ad..03d90eb902 100644
--- a/docs/d0/d32/mp2t__common_8h_source.html
+++ b/docs/d0/d32/mp2t__common_8h_source.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d33/classshaka_1_1MockRepresentation.html b/docs/d0/d33/classshaka_1_1MockRepresentation.html
index 6c1bab7cf2..d79c934676 100644
--- a/docs/d0/d33/classshaka_1_1MockRepresentation.html
+++ b/docs/d0/d33/classshaka_1_1MockRepresentation.html
@@ -160,7 +160,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d35/es__descriptor_8cc_source.html b/docs/d0/d35/es__descriptor_8cc_source.html
index 1f94cdde1d..2339c4f2d3 100644
--- a/docs/d0/d35/es__descriptor_8cc_source.html
+++ b/docs/d0/d35/es__descriptor_8cc_source.html
@@ -285,7 +285,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html b/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html
index 499c40dff2..fefa590bce 100644
--- a/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html
+++ b/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html
@@ -220,7 +220,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d3a/webm__constants_8h_source.html b/docs/d0/d3a/webm__constants_8h_source.html
index 469eac042c..0f875184e7 100644
--- a/docs/d0/d3a/webm__constants_8h_source.html
+++ b/docs/d0/d3a/webm__constants_8h_source.html
@@ -318,7 +318,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d3c/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader.html b/docs/d0/d3c/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader.html
index 0a598e6d90..d312e93fad 100644
--- a/docs/d0/d3c/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader.html
+++ b/docs/d0/d3c/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d42/aes__cryptor_8h_source.html b/docs/d0/d42/aes__cryptor_8h_source.html
index 01f0927716..f16c99b2ac 100644
--- a/docs/d0/d42/aes__cryptor_8h_source.html
+++ b/docs/d0/d42/aes__cryptor_8h_source.html
@@ -204,18 +204,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;</div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00025">aes_cryptor.h:25</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a812dfc641212f8eb877ab153de7fbb37"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">shaka::media::AesCryptor::UpdateIv</a></div><div class="ttdeci">void UpdateIv()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00080">aes_cryptor.cc:80</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a47fbdacc296fbddd899c47ec0c17e5e8"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">shaka::media::AesCryptor::AesCryptor</a></div><div class="ttdeci">AesCryptor(ConstantIvFlag constant_iv_flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00032">aes_cryptor.cc:32</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a812dfc641212f8eb877ab153de7fbb37"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">shaka::media::AesCryptor::UpdateIv</a></div><div class="ttdeci">void UpdateIv()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00078">aes_cryptor.cc:78</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a47fbdacc296fbddd899c47ec0c17e5e8"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">shaka::media::AesCryptor::AesCryptor</a></div><div class="ttdeci">AesCryptor(ConstantIvFlag constant_iv_flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00031">aes_cryptor.cc:31</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a41954df34b76b04d561892732dd0ec2f"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a41954df34b76b04d561892732dd0ec2f">shaka::media::AesCryptor::InitializeWithIv</a></div><div class="ttdeci">virtual bool InitializeWithIv(const std::vector&lt; uint8_t &gt; &amp;key, const std::vector&lt; uint8_t &gt; &amp;iv)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_ac5fc6e563807e6fce36c2dd43c928b3e"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#ac5fc6e563807e6fce36c2dd43c928b3e">shaka::media::AesCryptor::Crypt</a></div><div class="ttdeci">bool Crypt(const uint8_t *text, size_t text_size, uint8_t *crypt_text)</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00055">aes_cryptor.h:55</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">aes_cryptor.cc:69</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">aes_cryptor.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a731765982d899509626b4979322db926"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a731765982d899509626b4979322db926">shaka::media::AesCryptor::use_constant_iv</a></div><div class="ttdeci">bool use_constant_iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00084">aes_cryptor.h:84</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d42/widevine__encryption__flags_8cc_source.html b/docs/d0/d42/widevine__encryption__flags_8cc_source.html
index aff5a8a5f2..8e109097ba 100644
--- a/docs/d0/d42/widevine__encryption__flags_8cc_source.html
+++ b/docs/d0/d42/widevine__encryption__flags_8cc_source.html
@@ -258,7 +258,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d46/fourccs_8h_source.html b/docs/d0/d46/fourccs_8h_source.html
index 42a7028f92..2749431910 100644
--- a/docs/d0/d46/fourccs_8h_source.html
+++ b/docs/d0/d46/fourccs_8h_source.html
@@ -248,7 +248,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html b/docs/d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html
index 1dfd3e3c8a..1d08efca56 100644
--- a/docs/d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html
+++ b/docs/d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html
@@ -237,7 +237,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d4b/structshaka_1_1media_1_1mp4_1_1MediaInformation-members.html b/docs/d0/d4b/structshaka_1_1media_1_1mp4_1_1MediaInformation-members.html
index d1afa3a64a..a58c08cce0 100644
--- a/docs/d0/d4b/structshaka_1_1media_1_1mp4_1_1MediaInformation-members.html
+++ b/docs/d0/d4b/structshaka_1_1media_1_1mp4_1_1MediaInformation-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d4d/classshaka_1_1media_1_1AudioTimestampHelper.html b/docs/d0/d4d/classshaka_1_1media_1_1AudioTimestampHelper.html
index e59a69274a..d76b98029c 100644
--- a/docs/d0/d4d/classshaka_1_1media_1_1AudioTimestampHelper.html
+++ b/docs/d0/d4d/classshaka_1_1media_1_1AudioTimestampHelper.html
@@ -131,7 +131,7 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>GetFramesToTarget<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d4e/libcrypto__threading_8cc_source.html b/docs/d0/d4e/libcrypto__threading_8cc_source.html
index 971fcfcb16..a42cc3be96 100644
--- a/docs/d0/d4e/libcrypto__threading_8cc_source.html
+++ b/docs/d0/d4e/libcrypto__threading_8cc_source.html
@@ -143,7 +143,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d53/classshaka_1_1media_1_1mp2t_1_1TsMuxer-members.html b/docs/d0/d53/classshaka_1_1media_1_1mp2t_1_1TsMuxer-members.html
index 1f44079cc3..c8682a4823 100644
--- a/docs/d0/d53/classshaka_1_1media_1_1mp2t_1_1TsMuxer-members.html
+++ b/docs/d0/d53/classshaka_1_1media_1_1mp2t_1_1TsMuxer-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d5b/classshaka_1_1media_1_1MpdNotifyMuxerListener-members.html b/docs/d0/d5b/classshaka_1_1media_1_1MpdNotifyMuxerListener-members.html
index 0d74d187fc..4369ae7b23 100644
--- a/docs/d0/d5b/classshaka_1_1media_1_1MpdNotifyMuxerListener-members.html
+++ b/docs/d0/d5b/classshaka_1_1media_1_1MpdNotifyMuxerListener-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html b/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html
index 5998949ce0..fdf2bf781b 100644
--- a/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html
+++ b/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html
@@ -438,7 +438,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d6a/classshaka_1_1media_1_1StreamDescriptorCompareFn-members.html b/docs/d0/d6a/classshaka_1_1media_1_1StreamDescriptorCompareFn-members.html
index 2eece2503e..dff4b80eb2 100644
--- a/docs/d0/d6a/classshaka_1_1media_1_1StreamDescriptorCompareFn-members.html
+++ b/docs/d0/d6a/classshaka_1_1media_1_1StreamDescriptorCompareFn-members.html
@@ -97,7 +97,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d73/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry.html b/docs/d0/d73/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry.html
index eddb3a93f3..e55c8717cc 100644
--- a/docs/d0/d73/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry.html
+++ b/docs/d0/d73/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry.html
@@ -197,7 +197,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d7c/structshaka_1_1media_1_1mp4_1_1SampleToGroup.html b/docs/d0/d7c/structshaka_1_1media_1_1mp4_1_1SampleToGroup.html
index 58e4141aa0..3be80edb14 100644
--- a/docs/d0/d7c/structshaka_1_1media_1_1mp4_1_1SampleToGroup.html
+++ b/docs/d0/d7c/structshaka_1_1media_1_1mp4_1_1SampleToGroup.html
@@ -188,7 +188,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d7d/decryptor__source_8h_source.html b/docs/d0/d7d/decryptor__source_8h_source.html
index 8bd0859907..09cdbbc751 100644
--- a/docs/d0/d7d/decryptor__source_8h_source.html
+++ b/docs/d0/d7d/decryptor__source_8h_source.html
@@ -97,43 +97,43 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_DECRYPTOR_SOURCE_H_</span></div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;map&gt;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_decryptor.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decrypt_config.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
-<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a> {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source);</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  ~<a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>();</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keywordtype">bool</span> DecryptSampleBuffer(<span class="keyword">const</span> <a class="code" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a>* decrypt_config,</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                           uint8_t* buffer,</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                           <span class="keywordtype">size_t</span> buffer_size);</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source_;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  std::map&lt;std::vector&lt;uint8_t&gt;, <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a>*&gt; decryptor_map_;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>);</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;};</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_DECRYPTOR_SOURCE_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00025">aes_cryptor.h:25</a></div></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_decryptor.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decrypt_config.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
+<div class="line"><a name="l00022"></a><span class="lineno"><a class="line" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a> {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source);</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  ~<a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>();</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keywordtype">bool</span> DecryptSampleBuffer(<span class="keyword">const</span> <a class="code" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a>* decrypt_config,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                           uint8_t* buffer,</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                           <span class="keywordtype">size_t</span> buffer_size);</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source_;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  std::map&lt;std::vector&lt;uint8_t&gt;, std::unique_ptr&lt;AesCryptor&gt;&gt; decryptor_map_;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">DecryptorSource</a>);</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;};</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_DECRYPTOR_SOURCE_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1DecryptConfig_html"><div class="ttname"><a href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">shaka::media::DecryptConfig</a></div><div class="ttdef"><b>Definition:</b> <a href="../../df/dad/decrypt__config_8h_source.html#l00040">decrypt_config.h:40</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00021">decryptor_source.h:21</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00022">decryptor_source.h:22</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d80/classshaka_1_1media_1_1AesCbcEncryptor-members.html b/docs/d0/d80/classshaka_1_1media_1_1AesCbcEncryptor-members.html
index 1255564d8f..ae23db23d1 100644
--- a/docs/d0/d80/classshaka_1_1media_1_1AesCbcEncryptor-members.html
+++ b/docs/d0/d80/classshaka_1_1media_1_1AesCbcEncryptor-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d80/classshaka_1_1media_1_1Status-members.html b/docs/d0/d80/classshaka_1_1media_1_1Status-members.html
index c35bca4551..ca0f672cd1 100644
--- a/docs/d0/d80/classshaka_1_1media_1_1Status-members.html
+++ b/docs/d0/d80/classshaka_1_1media_1_1Status-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d93/classshaka_1_1media_1_1Status.html b/docs/d0/d93/classshaka_1_1media_1_1Status.html
index 016b96d74a..e1708e7ce5 100644
--- a/docs/d0/d93/classshaka_1_1media_1_1Status.html
+++ b/docs/d0/d93/classshaka_1_1media_1_1Status.html
@@ -302,7 +302,7 @@ static const <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html b/docs/d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html
index 8085cf7d7c..87e7146366 100644
--- a/docs/d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html
+++ b/docs/d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html
@@ -186,7 +186,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html b/docs/d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html
index 0dd34bb8ac..b5e64ce8ca 100644
--- a/docs/d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html
+++ b/docs/d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html
@@ -329,7 +329,7 @@ static const size_t&#160;</td><td class="memItemRight" valign="bottom"><a class=
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/da2/classshaka_1_1media_1_1RequestSigner-members.html b/docs/d0/da2/classshaka_1_1media_1_1RequestSigner-members.html
index 4573f8d6bf..1c620a7bd0 100644
--- a/docs/d0/da2/classshaka_1_1media_1_1RequestSigner-members.html
+++ b/docs/d0/da2/classshaka_1_1media_1_1RequestSigner-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/da2/structshaka_1_1xml_1_1XmlDeleter-members.html b/docs/d0/da2/structshaka_1_1xml_1_1XmlDeleter-members.html
index 85d2ccbf64..f821ad6b42 100644
--- a/docs/d0/da2/structshaka_1_1xml_1_1XmlDeleter-members.html
+++ b/docs/d0/da2/structshaka_1_1xml_1_1XmlDeleter-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/da6/stream__descriptor_8cc_source.html b/docs/d0/da6/stream__descriptor_8cc_source.html
index ae2cc81368..58efdeb742 100644
--- a/docs/d0/da6/stream__descriptor_8cc_source.html
+++ b/docs/d0/da6/stream__descriptor_8cc_source.html
@@ -295,7 +295,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html b/docs/d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html
index 799e546c15..633781f9e0 100644
--- a/docs/d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html
+++ b/docs/d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html
@@ -259,7 +259,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html b/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html
index 772df34471..d4ec9cdbd3 100644
--- a/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html
+++ b/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html
@@ -480,7 +480,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dbd/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter-members.html b/docs/d0/dbd/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter-members.html
index 4e56db528e..8b51c7abcc 100644
--- a/docs/d0/dbd/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter-members.html
+++ b/docs/d0/dbd/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter-members.html
@@ -123,7 +123,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dc1/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox-members.html b/docs/d0/dc1/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox-members.html
index dc66f30689..b0181c8401 100644
--- a/docs/d0/dc1/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox-members.html
+++ b/docs/d0/dc1/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dc8/classshaka_1_1xml_1_1AdaptationSetXmlNode-members.html b/docs/d0/dc8/classshaka_1_1xml_1_1AdaptationSetXmlNode-members.html
index 7614cbbaa4..e1bd1d96db 100644
--- a/docs/d0/dc8/classshaka_1_1xml_1_1AdaptationSetXmlNode-members.html
+++ b/docs/d0/dc8/classshaka_1_1xml_1_1AdaptationSetXmlNode-members.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html b/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html
index aaa33eebe8..29eb58f750 100644
--- a/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html
+++ b/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html
@@ -141,7 +141,7 @@ Static Public Member Functions</h2></td></tr>
 <p>Create an <a class="el" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html" title="Rsa private key, used for message signing and decryption. ">RsaPrivateKey</a> object using a DER encoded PKCS#1 RSAPrivateKey. </p>
 <dl class="section return"><dt>Returns</dt><dd>The created <a class="el" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html" title="Rsa private key, used for message signing and decryption. ">RsaPrivateKey</a> object on success, NULL otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00097">97</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00096">96</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -177,7 +177,7 @@ Static Public Member Functions</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successful, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00102">102</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00101">101</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -213,7 +213,7 @@ Static Public Member Functions</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successful, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00130">130</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00127">127</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -224,7 +224,7 @@ Static Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dd0/structshaka_1_1media_1_1mp4_1_1CueSettingsBox.html b/docs/d0/dd0/structshaka_1_1media_1_1mp4_1_1CueSettingsBox.html
index e6ea849b3c..2b93d8e657 100644
--- a/docs/d0/dd0/structshaka_1_1media_1_1mp4_1_1CueSettingsBox.html
+++ b/docs/d0/dd0/structshaka_1_1media_1_1mp4_1_1CueSettingsBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html b/docs/d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html
index 2d454b958a..9e3ed4b8e3 100644
--- a/docs/d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html
+++ b/docs/d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html
@@ -222,7 +222,7 @@ Static Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dd6/webm__crypto__helpers_8cc_source.html b/docs/d0/dd6/webm__crypto__helpers_8cc_source.html
index 1a5d9be01d..45b729cb06 100644
--- a/docs/d0/dd6/webm__crypto__helpers_8cc_source.html
+++ b/docs/d0/dd6/webm__crypto__helpers_8cc_source.html
@@ -205,7 +205,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html b/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html
index 3245201267..ae4b7366f4 100644
--- a/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html
+++ b/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html
@@ -165,7 +165,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dee/segmenter__test__base_8h_source.html b/docs/d0/dee/segmenter__test__base_8h_source.html
index 267b7803ba..0de56450af 100644
--- a/docs/d0/dee/segmenter__test__base_8h_source.html
+++ b/docs/d0/dee/segmenter__test__base_8h_source.html
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/df3/packager__util_8cc_source.html b/docs/d0/df3/packager__util_8cc_source.html
index d72355d9de..8b089d3f1e 100644
--- a/docs/d0/df3/packager__util_8cc_source.html
+++ b/docs/d0/df3/packager__util_8cc_source.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="keyword">namespace </span>shaka {</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">namespace </span>media {</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="keywordtype">void</span> DumpStreamInfo(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams) {</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="keywordtype">void</span> DumpStreamInfo(<span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams) {</div>
 <div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  printf(<span class="stringliteral">&quot;Found %zu stream(s).\n&quot;</span>, streams.size());</div>
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; streams.size(); ++i)</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    printf(<span class="stringliteral">&quot;Stream [%zu] %s\n&quot;</span>, i, streams[i]-&gt;info()-&gt;ToString().c_str());</div>
@@ -269,64 +269,66 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
 <div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;}</div>
 <div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;MediaStream* FindFirstStreamOfType(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;                                   StreamType stream_type) {</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="keyword">typedef</span> std::vector&lt;MediaStream*&gt;::const_iterator StreamIterator;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordflow">for</span> (StreamIterator it = streams.begin(); it != streams.end(); ++it) {</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">if</span> ((*it)-&gt;info()-&gt;stream_type() == stream_type)</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      <span class="keywordflow">return</span> *it;</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;MediaStream* FindFirstStreamOfType(</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams,</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    StreamType stream_type) {</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;MediaStream&gt;&amp; stream : streams) {</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">if</span> (stream-&gt;info()-&gt;stream_type() == stream_type)</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      <span class="keywordflow">return</span> stream.get();</div>
 <div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  }</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">nullptr</span>;</div>
 <div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;}</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;MediaStream* FindFirstVideoStream(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams) {</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">return</span> FindFirstStreamOfType(streams, kStreamVideo);</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;}</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;MediaStream* FindFirstAudioStream(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams) {</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="keywordflow">return</span> FindFirstStreamOfType(streams, kStreamAudio);</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;}</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;<span class="keywordtype">bool</span> AddStreamToMuxer(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;                      <span class="keyword">const</span> std::string&amp; stream_selector,</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;                      <span class="keyword">const</span> std::string&amp; language_override,</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;                      Muxer* muxer) {</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  DCHECK(muxer);</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  MediaStream* stream = NULL;</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <span class="keywordflow">if</span> (stream_selector == <span class="stringliteral">&quot;video&quot;</span>) {</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    stream = FindFirstVideoStream(streams);</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_selector == <span class="stringliteral">&quot;audio&quot;</span>) {</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    stream = FindFirstAudioStream(streams);</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="comment">// Expect stream_selector to be a zero based stream id.</span></div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    <span class="keywordtype">size_t</span> stream_id;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keywordflow">if</span> (!base::StringToSizeT(stream_selector, &amp;stream_id) ||</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;        stream_id &gt;= streams.size()) {</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid argument --stream=&quot;</span> &lt;&lt; stream_selector &lt;&lt; <span class="stringliteral">&quot;; &quot;</span></div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;should be &#39;audio&#39;, &#39;video&#39;, or a number within [0, &quot;</span></div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;                 &lt;&lt; streams.size() - 1 &lt;&lt; <span class="stringliteral">&quot;].&quot;</span>;</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    }</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    stream = streams[stream_id];</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    DCHECK(stream);</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  }</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="comment">// This could occur only if stream_selector=audio|video and the corresponding</span></div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  <span class="comment">// stream does not exist in the input.</span></div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordflow">if</span> (!stream) {</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;No &quot;</span> &lt;&lt; stream_selector &lt;&lt; <span class="stringliteral">&quot; stream found in the input.&quot;</span>;</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  }</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  <span class="keywordflow">if</span> (!language_override.empty()) {</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    stream-&gt;info()-&gt;set_language(language_override);</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  }</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  muxer-&gt;AddStream(stream);</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;}</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;MediaStream* FindFirstVideoStream(</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams) {</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordflow">return</span> FindFirstStreamOfType(streams, kStreamVideo);</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;}</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;MediaStream* FindFirstAudioStream(</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams) {</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordflow">return</span> FindFirstStreamOfType(streams, kStreamAudio);</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;}</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;<span class="keywordtype">bool</span> AddStreamToMuxer(<span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams,</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;                      <span class="keyword">const</span> std::string&amp; stream_selector,</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;                      <span class="keyword">const</span> std::string&amp; language_override,</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;                      Muxer* muxer) {</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  DCHECK(muxer);</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  MediaStream* stream = <span class="keyword">nullptr</span>;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="keywordflow">if</span> (stream_selector == <span class="stringliteral">&quot;video&quot;</span>) {</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    stream = FindFirstVideoStream(streams);</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_selector == <span class="stringliteral">&quot;audio&quot;</span>) {</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    stream = FindFirstAudioStream(streams);</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="comment">// Expect stream_selector to be a zero based stream id.</span></div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keywordtype">size_t</span> stream_id;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    <span class="keywordflow">if</span> (!base::StringToSizeT(stream_selector, &amp;stream_id) ||</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;        stream_id &gt;= streams.size()) {</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid argument --stream=&quot;</span> &lt;&lt; stream_selector &lt;&lt; <span class="stringliteral">&quot;; &quot;</span></div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;should be &#39;audio&#39;, &#39;video&#39;, or a number within [0, &quot;</span></div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;                 &lt;&lt; streams.size() - 1 &lt;&lt; <span class="stringliteral">&quot;].&quot;</span>;</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    }</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    stream = streams[stream_id].get();</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    DCHECK(stream);</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  }</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="comment">// This could occur only if stream_selector=audio|video and the corresponding</span></div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  <span class="comment">// stream does not exist in the input.</span></div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  <span class="keywordflow">if</span> (!stream) {</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;No &quot;</span> &lt;&lt; stream_selector &lt;&lt; <span class="stringliteral">&quot; stream found in the input.&quot;</span>;</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  }</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keywordflow">if</span> (!language_override.empty()) {</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    stream-&gt;info()-&gt;set_language(language_override);</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  }</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  muxer-&gt;AddStream(stream);</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;}</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaRequestSigner_html_af6af635a7c0a01bb638befb71b88386c"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">shaka::media::RsaRequestSigner::CreateSigner</a></div><div class="ttdeci">static RsaRequestSigner * CreateSigner(const std::string &amp;signer_name, const std::string &amp;pkcs1_rsa_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../d4/df5/request__signer_8cc_source.html#l00064">request_signer.cc:64</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesRequestSigner_html_a43f4cc9fad9901fa905805be81f7d58c"><div class="ttname"><a href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c">shaka::media::AesRequestSigner::CreateSigner</a></div><div class="ttdeci">static AesRequestSigner * CreateSigner(const std::string &amp;signer_name, const std::string &amp;aes_key_hex, const std::string &amp;iv_hex)</div><div class="ttdef"><b>Definition:</b> <a href="../../d4/df5/request__signer_8cc_source.html#l00029">request_signer.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a9a91ba439d785022a1e2ceeaa9ebe81a"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">shaka::media::FixedKeySource::CreateFromHexStrings</a></div><div class="ttdeci">static std::unique_ptr&lt; FixedKeySource &gt; CreateFromHexStrings(const std::string &amp;key_id_hex, const std::string &amp;key_hex, const std::string &amp;pssh_boxes_hex, const std::string &amp;iv_hex)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d6b/fixed__key__source_8cc_source.html#l00087">fixed_key_source.cc:87</a></div></div>
@@ -334,7 +336,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d0/dfc/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry-members.html b/docs/d0/dfc/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry-members.html
index 60bed78976..c62f66ac2f 100644
--- a/docs/d0/dfc/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry-members.html
+++ b/docs/d0/dfc/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry-members.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d0a/classshaka_1_1media_1_1MkvWriter.html b/docs/d1/d0a/classshaka_1_1media_1_1MkvWriter.html
index 8ecb6db01c..ac9e0d05c4 100644
--- a/docs/d1/d0a/classshaka_1_1media_1_1MkvWriter.html
+++ b/docs/d1/d0a/classshaka_1_1media_1_1MkvWriter.html
@@ -376,7 +376,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html b/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html
index 7e621c1dec..5078a41672 100644
--- a/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html
+++ b/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html
@@ -234,7 +234,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>chroma_array_type</b><
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00036">36</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00037">37</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following files:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 <li>media/codecs/<a class="el" href="../../dc/d7b/h264__parser_8cc_source.html">h264_parser.cc</a></li>
@@ -242,7 +242,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>chroma_array_type</b><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d0b/hevc__decoder__configuration__record_8cc_source.html b/docs/d1/d0b/hevc__decoder__configuration__record_8cc_source.html
index e8f632e919..0279769dbb 100644
--- a/docs/d1/d0b/hevc__decoder__configuration__record_8cc_source.html
+++ b/docs/d1/d0b/hevc__decoder__configuration__record_8cc_source.html
@@ -256,7 +256,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d12/classshaka_1_1media_1_1mp2t_1_1EsParserH264-members.html b/docs/d1/d12/classshaka_1_1media_1_1mp2t_1_1EsParserH264-members.html
index 3a56d3569c..00b8b2d213 100644
--- a/docs/d1/d12/classshaka_1_1media_1_1mp2t_1_1EsParserH264-members.html
+++ b/docs/d1/d12/classshaka_1_1media_1_1mp2t_1_1EsParserH264-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d13/status_8h_source.html b/docs/d1/d13/status_8h_source.html
index 296d845fa5..29679789aa 100644
--- a/docs/d1/d13/status_8h_source.html
+++ b/docs/d1/d13/status_8h_source.html
@@ -239,7 +239,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d1c/two__pass__single__segment__segmenter_8cc_source.html b/docs/d1/d1c/two__pass__single__segment__segmenter_8cc_source.html
index e7cbbd825b..7ced17916b 100644
--- a/docs/d1/d1c/two__pass__single__segment__segmenter_8cc_source.html
+++ b/docs/d1/d1c/two__pass__single__segment__segmenter_8cc_source.html
@@ -277,7 +277,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d1d/muxer__flags_8cc_source.html b/docs/d1/d1d/muxer__flags_8cc_source.html
index c8c708b182..924b3a0fa7 100644
--- a/docs/d1/d1d/muxer__flags_8cc_source.html
+++ b/docs/d1/d1d/muxer__flags_8cc_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html b/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html
index 10f679fa89..8fd039bc37 100644
--- a/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html
+++ b/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html
@@ -407,7 +407,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html b/docs/d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html
index 716ab68bc7..8346bf5cff 100644
--- a/docs/d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html
+++ b/docs/d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html
@@ -235,7 +235,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d27/key__fetcher_8h_source.html b/docs/d1/d27/key__fetcher_8h_source.html
index 79fa959ebf..ede5048ad0 100644
--- a/docs/d1/d27/key__fetcher_8h_source.html
+++ b/docs/d1/d27/key__fetcher_8h_source.html
@@ -126,7 +126,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d28/classshaka_1_1media_1_1mp2t_1_1AdtsHeader-members.html b/docs/d1/d28/classshaka_1_1media_1_1mp2t_1_1AdtsHeader-members.html
index 97bde72df5..73d1db461b 100644
--- a/docs/d1/d28/classshaka_1_1media_1_1mp2t_1_1AdtsHeader-members.html
+++ b/docs/d1/d28/classshaka_1_1media_1_1mp2t_1_1AdtsHeader-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d2a/decryptor__source_8cc_source.html b/docs/d1/d2a/decryptor__source_8cc_source.html
index 58a7c0ac11..a1341b61f9 100644
--- a/docs/d1/d2a/decryptor__source_8cc_source.html
+++ b/docs/d1/d2a/decryptor__source_8cc_source.html
@@ -96,120 +96,117 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decryptor_source.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_decryptor.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_pattern_cryptor.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;DecryptorSource::DecryptorSource(KeySource* key_source)</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;    : key_source_(key_source) {</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  CHECK(key_source);</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;}</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;DecryptorSource::~DecryptorSource() {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  STLDeleteValues(&amp;decryptor_map_);</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;}</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keywordtype">bool</span> DecryptorSource::DecryptSampleBuffer(<span class="keyword">const</span> DecryptConfig* decrypt_config,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                                          uint8_t* buffer,</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                                          <span class="keywordtype">size_t</span> buffer_size) {</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  DCHECK(decrypt_config);</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  DCHECK(buffer);</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="comment">// Get the decryptor object.</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  AesCryptor* decryptor;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keyword">auto</span> found = decryptor_map_.find(decrypt_config-&gt;key_id());</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keywordflow">if</span> (found == decryptor_map_.end()) {</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="comment">// Create new AesDecryptor based on decryption mode.</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    EncryptionKey key;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    Status status(key_source_-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(decrypt_config-&gt;key_id(), &amp;key));</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error retrieving decryption key: &quot;</span> &lt;&lt; status;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    }</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    std::unique_ptr&lt;AesCryptor&gt; aes_decryptor;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordflow">switch</span> (decrypt_config-&gt;protection_scheme()) {</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;      <span class="keywordflow">case</span> FOURCC_cenc:</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesCtrDecryptor);</div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_decryptor.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_pattern_cryptor.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;DecryptorSource::DecryptorSource(KeySource* key_source)</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;    : key_source_(key_source) {</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  CHECK(key_source);</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;}</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;DecryptorSource::~DecryptorSource() {}</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keywordtype">bool</span> DecryptorSource::DecryptSampleBuffer(<span class="keyword">const</span> DecryptConfig* decrypt_config,</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                                          uint8_t* buffer,</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                                          <span class="keywordtype">size_t</span> buffer_size) {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  DCHECK(decrypt_config);</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  DCHECK(buffer);</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="comment">// Get the decryptor object.</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  AesCryptor* decryptor = <span class="keyword">nullptr</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keyword">auto</span> found = decryptor_map_.find(decrypt_config-&gt;key_id());</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordflow">if</span> (found == decryptor_map_.end()) {</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="comment">// Create new AesDecryptor based on decryption mode.</span></div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    EncryptionKey key;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    Status status(key_source_-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(decrypt_config-&gt;key_id(), &amp;key));</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error retrieving decryption key: &quot;</span> &lt;&lt; status;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    }</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    std::unique_ptr&lt;AesCryptor&gt; aes_decryptor;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">switch</span> (decrypt_config-&gt;protection_scheme()) {</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      <span class="keywordflow">case</span> FOURCC_cenc:</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesCtrDecryptor);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;      <span class="keywordflow">case</span> FOURCC_cbc1:</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesCbcDecryptor(kNoPadding));</div>
 <div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;      <span class="keywordflow">case</span> FOURCC_cbc1:</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesCbcDecryptor(kNoPadding));</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;      <span class="keywordflow">case</span> FOURCC_cens:</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesPatternCryptor(</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;            decrypt_config-&gt;crypt_byte_block(),</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;            decrypt_config-&gt;skip_byte_block(),</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;            <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;            AesCryptor::kDontUseConstantIv,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;            std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCtrDecryptor())));</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;      <span class="keywordflow">case</span> FOURCC_cbcs:</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesPatternCryptor(</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;            decrypt_config-&gt;crypt_byte_block(),</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;            decrypt_config-&gt;skip_byte_block(),</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;            <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;            AesCryptor::kUseConstantIv,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;            std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCbcDecryptor(kNoPadding))));</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;      <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported protection scheme: &quot;</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;                   &lt;&lt; decrypt_config-&gt;protection_scheme();</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    }</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">if</span> (!aes_decryptor-&gt;InitializeWithIv(key.key, decrypt_config-&gt;iv())) {</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to initialize AesDecryptor for decryption.&quot;</span>;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    }</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    decryptor = aes_decryptor.release();</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    decryptor_map_[decrypt_config-&gt;key_id()] = decryptor;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    decryptor = found-&gt;second;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  }</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordflow">if</span> (!decryptor-&gt;SetIv(decrypt_config-&gt;iv())) {</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid initialization vector.&quot;</span>;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  }</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="keywordflow">if</span> (decrypt_config-&gt;subsamples().empty()) {</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="comment">// Sample not encrypted using subsample encryption. Decrypt whole.</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordflow">if</span> (!decryptor-&gt;Crypt(buffer, buffer_size, buffer)) {</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error during bulk sample decryption.&quot;</span>;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    }</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  }</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// Subsample decryption.</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keyword">const</span> std::vector&lt;SubsampleEntry&gt;&amp; subsamples = decrypt_config-&gt;subsamples();</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  uint8_t* current_ptr = buffer;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keyword">const</span> uint8_t* <span class="keyword">const</span> buffer_end = buffer + buffer_size;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> <span class="keyword">auto</span>&amp; subsample : subsamples) {</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="keywordflow">if</span> ((current_ptr + subsample.clear_bytes + subsample.cipher_bytes) &gt;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        buffer_end) {</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Subsamples overflow sample buffer.&quot;</span>;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    }</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    current_ptr += subsample.clear_bytes;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keywordflow">if</span> (!decryptor-&gt;Crypt(current_ptr, subsample.cipher_bytes, current_ptr)) {</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error decrypting subsample buffer.&quot;</span>;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    }</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    current_ptr += subsample.cipher_bytes;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  }</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;      <span class="keywordflow">case</span> FOURCC_cens:</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesPatternCryptor(</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;            decrypt_config-&gt;crypt_byte_block(),</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;            decrypt_config-&gt;skip_byte_block(),</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;            <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;            AesCryptor::kDontUseConstantIv,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;            std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCtrDecryptor())));</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      <span class="keywordflow">case</span> FOURCC_cbcs:</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        aes_decryptor.reset(<span class="keyword">new</span> AesPatternCryptor(</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;            decrypt_config-&gt;crypt_byte_block(),</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;            decrypt_config-&gt;skip_byte_block(),</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;            <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;            AesCryptor::kUseConstantIv,</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;            std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCbcDecryptor(kNoPadding))));</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;      <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported protection scheme: &quot;</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                   &lt;&lt; decrypt_config-&gt;protection_scheme();</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    }</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">if</span> (!aes_decryptor-&gt;InitializeWithIv(key.key, decrypt_config-&gt;iv())) {</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to initialize AesDecryptor for decryption.&quot;</span>;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    }</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    decryptor = aes_decryptor.get();</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    decryptor_map_[decrypt_config-&gt;key_id()] = std::move(aes_decryptor);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    decryptor = found-&gt;second.get();</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  }</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordflow">if</span> (!decryptor-&gt;SetIv(decrypt_config-&gt;iv())) {</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid initialization vector.&quot;</span>;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  }</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordflow">if</span> (decrypt_config-&gt;subsamples().empty()) {</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="comment">// Sample not encrypted using subsample encryption. Decrypt whole.</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordflow">if</span> (!decryptor-&gt;Crypt(buffer, buffer_size, buffer)) {</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error during bulk sample decryption.&quot;</span>;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    }</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  }</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="comment">// Subsample decryption.</span></div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="keyword">const</span> std::vector&lt;SubsampleEntry&gt;&amp; subsamples = decrypt_config-&gt;subsamples();</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  uint8_t* current_ptr = buffer;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keyword">const</span> uint8_t* <span class="keyword">const</span> buffer_end = buffer + buffer_size;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> <span class="keyword">auto</span>&amp; subsample : subsamples) {</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="keywordflow">if</span> ((current_ptr + subsample.clear_bytes + subsample.cipher_bytes) &gt;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        buffer_end) {</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Subsamples overflow sample buffer.&quot;</span>;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    }</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    current_ptr += subsample.clear_bytes;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keywordflow">if</span> (!decryptor-&gt;Crypt(current_ptr, subsample.cipher_bytes, current_ptr)) {</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Error decrypting subsample buffer.&quot;</span>;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    }</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    current_ptr += subsample.cipher_bytes;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  }</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;}</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">shaka::media::AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00026">aes_pattern_cryptor.h:26</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_a994eb66cf09d8b08fd1c964f6afd3ab3"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">shaka::media::KeySource::GetKey</a></div><div class="ttdeci">virtual Status GetKey(TrackType track_type, EncryptionKey *key)=0</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d2c/structshaka_1_1media_1_1mp4_1_1DataReference-members.html b/docs/d1/d2c/structshaka_1_1media_1_1mp4_1_1DataReference-members.html
index 4183913a3c..b18ca9eaf2 100644
--- a/docs/d1/d2c/structshaka_1_1media_1_1mp4_1_1DataReference-members.html
+++ b/docs/d1/d2c/structshaka_1_1media_1_1mp4_1_1DataReference-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html b/docs/d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html
index 2b161cefcd..d8355332c2 100644
--- a/docs/d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html
+++ b/docs/d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html
@@ -385,7 +385,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>BoxBuffer</b></td></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d2f/webvtt__media__parser_8cc_source.html b/docs/d1/d2f/webvtt__media__parser_8cc_source.html
index 039e3de4c5..a9252a4214 100644
--- a/docs/d1/d2f/webvtt__media__parser_8cc_source.html
+++ b/docs/d1/d2f/webvtt__media__parser_8cc_source.html
@@ -488,7 +488,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html b/docs/d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html
index 70909d0c05..79d9ef3d43 100644
--- a/docs/d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html
+++ b/docs/d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html
@@ -142,7 +142,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html b/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html
index 19a006a1c0..ee68cda150 100644
--- a/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html
+++ b/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html
@@ -168,7 +168,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00055">55</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00054">54</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -195,7 +195,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00062">62</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00061">61</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -213,7 +213,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>Raw pointer to the element. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00149">149</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00148">148</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -232,7 +232,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <p>Transfer the ownership of the xmlNodePtr. After calling this method, the behavior of any methods, except the destructor, is undefined. </p>
 <dl class="section return"><dt>Returns</dt><dd>The resource of this object. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00137">137</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00136">136</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -250,7 +250,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><div class="memdoc">
 <p>Release the xmlNodePtr of this object. After calling this method, the behavior of any methods, except the destructor, is undefined. </p>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00143">143</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00142">142</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -275,7 +275,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00132">132</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00131">131</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -311,7 +311,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00119">119</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00118">118</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -336,7 +336,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00128">128</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00127">127</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -372,7 +372,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00111">111</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00110">110</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -408,7 +408,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00104">104</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00103">103</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -419,7 +419,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d34/structshaka_1_1media_1_1SubsampleEntry.html b/docs/d1/d34/structshaka_1_1media_1_1SubsampleEntry.html
index 42f05c082f..c1a4a62598 100644
--- a/docs/d1/d34/structshaka_1_1media_1_1SubsampleEntry.html
+++ b/docs/d1/d34/structshaka_1_1media_1_1SubsampleEntry.html
@@ -122,7 +122,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>cipher_bytes</b><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d37/es__parser__h264_8h_source.html b/docs/d1/d37/es__parser__h264_8h_source.html
index 4ba203c349..59f1d9d782 100644
--- a/docs/d1/d37/es__parser__h264_8h_source.html
+++ b/docs/d1/d37/es__parser__h264_8h_source.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d3b/mpd__generator__flags_8h_source.html b/docs/d1/d3b/mpd__generator__flags_8h_source.html
index 5bab622e58..5af5ddc00c 100644
--- a/docs/d1/d3b/mpd__generator__flags_8h_source.html
+++ b/docs/d1/d3b/mpd__generator__flags_8h_source.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d3e/structshaka_1_1media_1_1mp4_1_1MovieExtends.html b/docs/d1/d3e/structshaka_1_1media_1_1mp4_1_1MovieExtends.html
index 1fb5339b74..a3e951bdc8 100644
--- a/docs/d1/d3e/structshaka_1_1media_1_1mp4_1_1MovieExtends.html
+++ b/docs/d1/d3e/structshaka_1_1media_1_1mp4_1_1MovieExtends.html
@@ -176,7 +176,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d40/classshaka_1_1MpdWriter-members.html b/docs/d1/d40/classshaka_1_1MpdWriter-members.html
index 3fc6dc1cee..76ac175cd5 100644
--- a/docs/d1/d40/classshaka_1_1MpdWriter-members.html
+++ b/docs/d1/d40/classshaka_1_1MpdWriter-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d45/decoding__time__iterator_8cc_source.html b/docs/d1/d45/decoding__time__iterator_8cc_source.html
index 2927b1e532..da47cdba6c 100644
--- a/docs/d1/d45/decoding__time__iterator_8cc_source.html
+++ b/docs/d1/d45/decoding__time__iterator_8cc_source.html
@@ -168,7 +168,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d48/text__track__config_8h_source.html b/docs/d1/d48/text__track__config_8h_source.html
index 7b54d9eed6..23a698eebc 100644
--- a/docs/d1/d48/text__track__config_8h_source.html
+++ b/docs/d1/d48/text__track__config_8h_source.html
@@ -139,7 +139,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d4f/classshaka_1_1media_1_1OffsetByteQueue-members.html b/docs/d1/d4f/classshaka_1_1media_1_1OffsetByteQueue-members.html
index 558eef0bfa..57d46c138f 100644
--- a/docs/d1/d4f/classshaka_1_1media_1_1OffsetByteQueue-members.html
+++ b/docs/d1/d4f/classshaka_1_1media_1_1OffsetByteQueue-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d5a/structshaka_1_1media_1_1EncryptionKey-members.html b/docs/d1/d5a/structshaka_1_1media_1_1EncryptionKey-members.html
index 2db3d72b37..0265cb96d6 100644
--- a/docs/d1/d5a/structshaka_1_1media_1_1EncryptionKey-members.html
+++ b/docs/d1/d5a/structshaka_1_1media_1_1EncryptionKey-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d6e/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader.html b/docs/d1/d6e/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader.html
index b127ed514a..3854f9de60 100644
--- a/docs/d1/d6e/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader.html
+++ b/docs/d1/d6e/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader.html
@@ -222,7 +222,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d70/vp8__parser_8cc_source.html b/docs/d1/d70/vp8__parser_8cc_source.html
index edd27287d9..6ff9a3dd8b 100644
--- a/docs/d1/d70/vp8__parser_8cc_source.html
+++ b/docs/d1/d70/vp8__parser_8cc_source.html
@@ -293,7 +293,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d72/language__utils_8cc_source.html b/docs/d1/d72/language__utils_8cc_source.html
index 8b0fc441f6..d2f32bcc29 100644
--- a/docs/d1/d72/language__utils_8cc_source.html
+++ b/docs/d1/d72/language__utils_8cc_source.html
@@ -226,7 +226,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d74/mp2t__media__parser_8cc_source.html b/docs/d1/d74/mp2t__media__parser_8cc_source.html
index ac3106e00c..711e3013d1 100644
--- a/docs/d1/d74/mp2t__media__parser_8cc_source.html
+++ b/docs/d1/d74/mp2t__media__parser_8cc_source.html
@@ -95,445 +95,443 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/base/bind.h&quot;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_adts.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_h264.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_h265.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/mp2t_common.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_packet.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pat.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pes.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pmt.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">enum</span> StreamType {</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="comment">// ISO-13818.1 / ITU H.222 Table 2.34 &quot;Stream type assignments&quot;</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  kStreamTypeMpeg1Audio = 0x3,</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  kStreamTypeAAC = 0xf,</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  kStreamTypeAVC = 0x1b,</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  kStreamTypeHEVC = 0x24,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;};</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">class </span>PidState {</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keyword">enum</span> PidType {</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    kPidPat,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    kPidPmt,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    kPidAudioPes,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    kPidVideoPes,</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  };</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  PidState(<span class="keywordtype">int</span> pid,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;           PidType pid_type,</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;           std::unique_ptr&lt;TsSection&gt; section_parser);</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="comment">// Extract the content of the TS packet and parse it.</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="comment">// Return true if successful.</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">bool</span> PushTsPacket(<span class="keyword">const</span> TsPacket&amp; ts_packet);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// Flush the PID state (possibly emitting some pending frames)</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="comment">// and reset its state.</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">void</span> Flush();</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="comment">// Enable/disable the PID.</span></div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="comment">// Disabling a PID will reset its state and ignore any further incoming TS</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// packets.</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> Enable();</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> Disable();</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">bool</span> IsEnabled() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  PidType pid_type()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> pid_type_; }</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  scoped_refptr&lt;StreamInfo&gt;&amp; config() { <span class="keywordflow">return</span> config_; }</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">void</span> set_config(<span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; config) { config_ = config; }</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  SampleQueue&amp; sample_queue() { <span class="keywordflow">return</span> sample_queue_; }</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordtype">void</span> ResetState();</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordtype">int</span> pid_;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  PidType pid_type_;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  std::unique_ptr&lt;TsSection&gt; section_parser_;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">bool</span> enable_;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">int</span> continuity_counter_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  scoped_refptr&lt;StreamInfo&gt; config_;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  SampleQueue sample_queue_;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;};</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;PidState::PidState(<span class="keywordtype">int</span> pid,</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;                   PidType pid_type,</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                   std::unique_ptr&lt;TsSection&gt; section_parser)</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    : pid_(pid),</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      pid_type_(pid_type),</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      section_parser_(std::move(section_parser)),</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      enable_(false),</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      continuity_counter_(-1) {</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  DCHECK(section_parser_);</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;}</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;<span class="keywordtype">bool</span> PidState::PushTsPacket(<span class="keyword">const</span> TsPacket&amp; ts_packet) {</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  DCHECK_EQ(ts_packet.pid(), pid_);</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// The current PID is not part of the PID filter,</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="comment">// just discard the incoming TS packet.</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordflow">if</span> (!enable_)</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="keywordtype">int</span> expected_continuity_counter = (continuity_counter_ + 1) % 16;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordflow">if</span> (continuity_counter_ &gt;= 0 &amp;&amp;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;      ts_packet.continuity_counter() != expected_continuity_counter) {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;TS discontinuity detected for pid: &quot;</span> &lt;&lt; pid_;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="comment">// TODO(tinskip): Handle discontinuity better.</span></div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  }</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordtype">bool</span> status = section_parser_-&gt;Parse(</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      ts_packet.payload_unit_start_indicator(),</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      ts_packet.payload(),</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;      ts_packet.payload_size());</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="comment">// At the minimum, when parsing failed, auto reset the section parser.</span></div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="comment">// Components that use the Mp2tMediaParser can take further action if needed.</span></div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="keywordflow">if</span> (!status) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Parsing failed for pid = &quot;</span> &lt;&lt; pid_;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    ResetState();</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  }</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;}</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;<span class="keywordtype">void</span> PidState::Flush() {</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  section_parser_-&gt;Flush();</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  ResetState();</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;}</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;<span class="keywordtype">void</span> PidState::Enable() {</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  enable_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;}</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;<span class="keywordtype">void</span> PidState::Disable() {</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  <span class="keywordflow">if</span> (!enable_)</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  ResetState();</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  enable_ = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;}</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;<span class="keywordtype">bool</span> PidState::IsEnabled()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keywordflow">return</span> enable_;</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;}</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;<span class="keywordtype">void</span> PidState::ResetState() {</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  section_parser_-&gt;Reset();</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  continuity_counter_ = -1;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;}</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;Mp2tMediaParser::Mp2tMediaParser()</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    : sbr_in_mimetype_(false),</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      is_initialized_(false) {</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;}</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;Mp2tMediaParser::~Mp2tMediaParser() {</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  STLDeleteValues(&amp;pids_);</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;}</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;</div>
-<div class="line"><a name="l00160"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">  160</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">Mp2tMediaParser::Init</a>(</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;    <span class="keyword">const</span> InitCB&amp; init_cb,</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keyword">const</span> NewSampleCB&amp; new_sample_cb,</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) {</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  DCHECK(!is_initialized_);</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  DCHECK(init_cb_.is_null());</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  DCHECK(!init_cb.is_null());</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  DCHECK(!new_sample_cb.is_null());</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  init_cb_ = init_cb;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  new_sample_cb_ = new_sample_cb;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;}</div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_adts.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_h264.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser_h265.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/mp2t_common.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_packet.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pat.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pes.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_section_pmt.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">enum</span> StreamType {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="comment">// ISO-13818.1 / ITU H.222 Table 2.34 &quot;Stream type assignments&quot;</span></div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  kStreamTypeMpeg1Audio = 0x3,</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  kStreamTypeAAC = 0xf,</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  kStreamTypeAVC = 0x1b,</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  kStreamTypeHEVC = 0x24,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;};</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">class </span>PidState {</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keyword">enum</span> PidType {</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    kPidPat,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    kPidPmt,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    kPidAudioPes,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    kPidVideoPes,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  };</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  PidState(<span class="keywordtype">int</span> pid,</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;           PidType pid_type,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;           std::unique_ptr&lt;TsSection&gt; section_parser);</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="comment">// Extract the content of the TS packet and parse it.</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="comment">// Return true if successful.</span></div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordtype">bool</span> PushTsPacket(<span class="keyword">const</span> TsPacket&amp; ts_packet);</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="comment">// Flush the PID state (possibly emitting some pending frames)</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// and reset its state.</span></div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">void</span> Flush();</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// Enable/disable the PID.</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="comment">// Disabling a PID will reset its state and ignore any further incoming TS</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="comment">// packets.</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="keywordtype">void</span> Enable();</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> Disable();</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">bool</span> IsEnabled() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  PidType pid_type()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> pid_type_; }</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  scoped_refptr&lt;StreamInfo&gt;&amp; config() { <span class="keywordflow">return</span> config_; }</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">void</span> set_config(<span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; config) { config_ = config; }</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  SampleQueue&amp; sample_queue() { <span class="keywordflow">return</span> sample_queue_; }</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">void</span> ResetState();</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">int</span> pid_;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  PidType pid_type_;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  std::unique_ptr&lt;TsSection&gt; section_parser_;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">bool</span> enable_;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">int</span> continuity_counter_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  scoped_refptr&lt;StreamInfo&gt; config_;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  SampleQueue sample_queue_;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;};</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;PidState::PidState(<span class="keywordtype">int</span> pid,</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;                   PidType pid_type,</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;                   std::unique_ptr&lt;TsSection&gt; section_parser)</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    : pid_(pid),</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      pid_type_(pid_type),</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      section_parser_(std::move(section_parser)),</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      enable_(false),</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      continuity_counter_(-1) {</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  DCHECK(section_parser_);</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;}</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;<span class="keywordtype">bool</span> PidState::PushTsPacket(<span class="keyword">const</span> TsPacket&amp; ts_packet) {</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  DCHECK_EQ(ts_packet.pid(), pid_);</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// The current PID is not part of the PID filter,</span></div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// just discard the incoming TS packet.</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">if</span> (!enable_)</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordtype">int</span> expected_continuity_counter = (continuity_counter_ + 1) % 16;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="keywordflow">if</span> (continuity_counter_ &gt;= 0 &amp;&amp;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;      ts_packet.continuity_counter() != expected_continuity_counter) {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;TS discontinuity detected for pid: &quot;</span> &lt;&lt; pid_;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="comment">// TODO(tinskip): Handle discontinuity better.</span></div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  }</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordtype">bool</span> status = section_parser_-&gt;Parse(</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;      ts_packet.payload_unit_start_indicator(),</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      ts_packet.payload(),</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      ts_packet.payload_size());</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="comment">// At the minimum, when parsing failed, auto reset the section parser.</span></div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="comment">// Components that use the Mp2tMediaParser can take further action if needed.</span></div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="keywordflow">if</span> (!status) {</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Parsing failed for pid = &quot;</span> &lt;&lt; pid_;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    ResetState();</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  }</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;}</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;<span class="keywordtype">void</span> PidState::Flush() {</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  section_parser_-&gt;Flush();</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  ResetState();</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;}</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;<span class="keywordtype">void</span> PidState::Enable() {</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  enable_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;}</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;<span class="keywordtype">void</span> PidState::Disable() {</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="keywordflow">if</span> (!enable_)</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  ResetState();</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  enable_ = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;}</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="keywordtype">bool</span> PidState::IsEnabled()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  <span class="keywordflow">return</span> enable_;</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;}</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;<span class="keywordtype">void</span> PidState::ResetState() {</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  section_parser_-&gt;Reset();</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  continuity_counter_ = -1;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;}</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;Mp2tMediaParser::Mp2tMediaParser()</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    : sbr_in_mimetype_(false),</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      is_initialized_(false) {</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;}</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;Mp2tMediaParser::~Mp2tMediaParser() {}</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
+<div class="line"><a name="l00157"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">  157</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">Mp2tMediaParser::Init</a>(</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keyword">const</span> InitCB&amp; init_cb,</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    <span class="keyword">const</span> NewSampleCB&amp; new_sample_cb,</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) {</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  DCHECK(!is_initialized_);</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  DCHECK(init_cb_.is_null());</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  DCHECK(!init_cb.is_null());</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  DCHECK(!new_sample_cb.is_null());</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  init_cb_ = init_cb;</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  new_sample_cb_ = new_sample_cb;</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;}</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
+<div class="line"><a name="l00170"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">  170</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">Mp2tMediaParser::Flush</a>() {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Flush&quot;</span>;</div>
 <div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
-<div class="line"><a name="l00173"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">  173</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">Mp2tMediaParser::Flush</a>() {</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Flush&quot;</span>;</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  <span class="comment">// Flush the buffers and reset the pids.</span></div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keywordflow">for</span> (std::map&lt;int, PidState*&gt;::iterator it = pids_.begin();</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;       it != pids_.end(); ++it) {</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Flushing PID: &quot;</span> &lt;&lt; it-&gt;first;</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    PidState* pid_state = it-&gt;second;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    pid_state-&gt;Flush();</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  }</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordtype">bool</span> result = EmitRemainingSamples();</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  STLDeleteValues(&amp;pids_);</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="comment">// Remove any bytes left in the TS buffer.</span></div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="comment">// (i.e. any partial TS packet =&gt; less than 188 bytes).</span></div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  ts_byte_queue_.Reset();</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <span class="keywordflow">return</span> result;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;}</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
-<div class="line"><a name="l00192"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">  192</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">Mp2tMediaParser::Parse</a>(<span class="keyword">const</span> uint8_t* buf, <span class="keywordtype">int</span> size) {</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Parse size=&quot;</span> &lt;&lt; size;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="comment">// Add the data to the parser state.</span></div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  ts_byte_queue_.Push(buf, size);</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordflow">while</span> (<span class="keyword">true</span>) {</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    <span class="keyword">const</span> uint8_t* ts_buffer;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="keywordtype">int</span> ts_buffer_size;</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    ts_byte_queue_.Peek(&amp;ts_buffer, &amp;ts_buffer_size);</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    <span class="keywordflow">if</span> (ts_buffer_size &lt; TsPacket::kPacketSize)</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    <span class="comment">// Synchronization.</span></div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;    <span class="keywordtype">int</span> skipped_bytes = TsPacket::Sync(ts_buffer, ts_buffer_size);</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    <span class="keywordflow">if</span> (skipped_bytes &gt; 0) {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Packet not aligned on a TS syncword:&quot;</span></div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;               &lt;&lt; <span class="stringliteral">&quot; skipped_bytes=&quot;</span> &lt;&lt; skipped_bytes;</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;      ts_byte_queue_.Pop(skipped_bytes);</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    }</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="comment">// Parse the TS header, skipping 1 byte if the header is invalid.</span></div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    std::unique_ptr&lt;TsPacket&gt; ts_packet(</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;        TsPacket::Parse(ts_buffer, ts_buffer_size));</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="keywordflow">if</span> (!ts_packet) {</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Error: invalid TS packet&quot;</span>;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;      ts_byte_queue_.Pop(1);</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    }</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    DVLOG(LOG_LEVEL_TS)</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;        &lt;&lt; <span class="stringliteral">&quot;Processing PID=&quot;</span> &lt;&lt; ts_packet-&gt;pid()</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;        &lt;&lt; <span class="stringliteral">&quot; start_unit=&quot;</span> &lt;&lt; ts_packet-&gt;payload_unit_start_indicator();</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <span class="comment">// Parse the section.</span></div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    std::map&lt;int, PidState*&gt;::iterator it = pids_.find(ts_packet-&gt;pid());</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">if</span> (it == pids_.end() &amp;&amp;</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;        ts_packet-&gt;pid() == TsSection::kPidPat) {</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;      <span class="comment">// Create the PAT state here if needed.</span></div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;      std::unique_ptr&lt;TsSection&gt; pat_section_parser(<span class="keyword">new</span> <a class="code" href="../../d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html">TsSectionPat</a>(</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;          base::Bind(&amp;Mp2tMediaParser::RegisterPmt, base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;      std::unique_ptr&lt;PidState&gt; pat_pid_state(<span class="keyword">new</span> PidState(</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;          ts_packet-&gt;pid(), PidState::kPidPat, std::move(pat_section_parser)));</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;      pat_pid_state-&gt;Enable();</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;      it = pids_.insert(</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;          std::pair&lt;int, PidState*&gt;(ts_packet-&gt;pid(),</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;                                    pat_pid_state.release())).first;</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    }</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    <span class="keywordflow">if</span> (it != pids_.end()) {</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;      <span class="keywordflow">if</span> (!it-&gt;second-&gt;PushTsPacket(*ts_packet))</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;      DVLOG(LOG_LEVEL_TS) &lt;&lt; <span class="stringliteral">&quot;Ignoring TS packet for pid: &quot;</span> &lt;&lt; ts_packet-&gt;pid();</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    }</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;    <span class="comment">// Go to the next packet.</span></div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;    ts_byte_queue_.Pop(TsPacket::kPacketSize);</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;  }</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  <span class="comment">// Emit the A/V buffers that kept accumulating during TS parsing.</span></div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  <span class="keywordflow">return</span> EmitRemainingSamples();</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;}</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::RegisterPmt(<span class="keywordtype">int</span> program_number, <span class="keywordtype">int</span> pmt_pid) {</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;RegisterPmt:&quot;</span></div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; program_number=&quot;</span> &lt;&lt; program_number</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pmt_pid=&quot;</span> &lt;&lt; pmt_pid;</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="comment">// Only one TS program is allowed. Ignore the incoming program map table,</span></div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  <span class="comment">// if there is already one registered.</span></div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="keywordflow">for</span> (std::map&lt;int, PidState*&gt;::iterator it = pids_.begin();</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;       it != pids_.end(); ++it) {</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    PidState* pid_state = it-&gt;second;</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;    <span class="keywordflow">if</span> (pid_state-&gt;pid_type() == PidState::kPidPmt) {</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      DVLOG_IF(1, pmt_pid != it-&gt;first) &lt;&lt; <span class="stringliteral">&quot;More than one program is defined&quot;</span>;</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;      <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;    }</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  }</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;  <span class="comment">// Create the PMT state here if needed.</span></div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Create a new PMT parser&quot;</span>;</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;  std::unique_ptr&lt;TsSection&gt; pmt_section_parser(<span class="keyword">new</span> TsSectionPmt(base::Bind(</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;      &amp;Mp2tMediaParser::RegisterPes, base::Unretained(<span class="keyword">this</span>), pmt_pid)));</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;  std::unique_ptr&lt;PidState&gt; pmt_pid_state(</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;      <span class="keyword">new</span> PidState(pmt_pid, PidState::kPidPmt, std::move(pmt_section_parser)));</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  pmt_pid_state-&gt;Enable();</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;  pids_.insert(std::pair&lt;int, PidState*&gt;(pmt_pid, pmt_pid_state.release()));</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;}</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::RegisterPes(<span class="keywordtype">int</span> pmt_pid,</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;                                  <span class="keywordtype">int</span> pes_pid,</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;                                  <span class="keywordtype">int</span> stream_type) {</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;RegisterPes:&quot;</span></div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pes_pid=&quot;</span> &lt;&lt; pes_pid</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; stream_type=&quot;</span> &lt;&lt; std::hex &lt;&lt; stream_type &lt;&lt; std::dec;</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;  std::map&lt;int, PidState*&gt;::iterator it = pids_.find(pes_pid);</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <span class="keywordflow">if</span> (it != pids_.end())</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  <span class="comment">// Create a stream parser corresponding to the stream type.</span></div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  <span class="keywordtype">bool</span> is_audio = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  std::unique_ptr&lt;EsParser&gt; es_parser;</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keywordflow">if</span> (stream_type == kStreamTypeAVC) {</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        <span class="keyword">new</span> EsParserH264(</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeHEVC) {</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;        <span class="keyword">new</span> EsParserH265(</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeAAC) {</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;        <span class="keyword">new</span> EsParserAdts(</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;            sbr_in_mimetype_));</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;    is_audio = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  }</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  <span class="comment">// Create the PES state here.</span></div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Create a new PES state&quot;</span>;</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  std::unique_ptr&lt;TsSection&gt; pes_section_parser(</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;      <span class="keyword">new</span> TsSectionPes(std::move(es_parser)));</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  PidState::PidType pid_type =</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;      is_audio ? PidState::kPidAudioPes : PidState::kPidVideoPes;</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;  std::unique_ptr&lt;PidState&gt; pes_pid_state(</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;      <span class="keyword">new</span> PidState(pes_pid, pid_type, std::move(pes_section_parser)));</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  pes_pid_state-&gt;Enable();</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  pids_.insert(std::pair&lt;int, PidState*&gt;(pes_pid, pes_pid_state.release()));</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;}</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::OnNewStreamInfo(</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; new_stream_info) {</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;  DCHECK(new_stream_info);</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;OnVideoConfigChanged for pid=&quot;</span> &lt;&lt; new_stream_info-&gt;track_id();</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;  PidMap::iterator pid_state = pids_.find(new_stream_info-&gt;track_id());</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;PID State for new stream not found (pid = &quot;</span></div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;               &lt;&lt; new_stream_info-&gt;track_id() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  }</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  <span class="comment">// Set the stream configuration information for the PID.</span></div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  pid_state-&gt;second-&gt;set_config(new_stream_info);</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  <span class="comment">// Finish initialization if all streams have configs.</span></div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;  FinishInitializationIfNeeded();</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;}</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::FinishInitializationIfNeeded() {</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="comment">// Nothing to be done if already initialized.</span></div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;  <span class="keywordflow">if</span> (is_initialized_)</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;  <span class="comment">// Wait for more data to come to finish initialization.</span></div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  <span class="keywordflow">if</span> (pids_.empty())</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt; all_stream_info;</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  uint32_t num_es(0);</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator iter = pids_.begin(); iter != pids_.end();</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;       ++iter) {</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;    <span class="keywordflow">if</span> (((iter-&gt;second-&gt;pid_type() == PidState::kPidAudioPes) ||</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;         (iter-&gt;second-&gt;pid_type() == PidState::kPidVideoPes))) {</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;      ++num_es;</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      <span class="keywordflow">if</span> (iter-&gt;second-&gt;config())</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;        all_stream_info.push_back(iter-&gt;second-&gt;config());</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    }</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  }</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;  <span class="keywordflow">if</span> (num_es &amp;&amp; (all_stream_info.size() == num_es)) {</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;    <span class="comment">// All stream configurations have been received. Initialization can</span></div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    <span class="comment">// be completed.</span></div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    init_cb_.Run(all_stream_info);</div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mpeg2TS stream parser initialization done&quot;</span>;</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;    is_initialized_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;  }</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;}</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::OnEmitSample(</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;    uint32_t pes_pid,</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; new_sample) {</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;  DCHECK(new_sample);</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;  DVLOG(LOG_LEVEL_ES)</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;OnEmitSample: &quot;</span></div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pid=&quot;</span></div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;      &lt;&lt; pes_pid</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; size=&quot;</span></div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;      &lt;&lt; new_sample-&gt;data_size()</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; dts=&quot;</span></div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;      &lt;&lt; new_sample-&gt;dts()</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pts=&quot;</span></div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;      &lt;&lt; new_sample-&gt;pts();</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  <span class="comment">// Add the sample to the appropriate PID sample queue.</span></div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  PidMap::iterator pid_state = pids_.find(pes_pid);</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;PID State for new sample not found (pid = &quot;</span></div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;               &lt;&lt; pes_pid &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;  }</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  pid_state-&gt;second-&gt;sample_queue().push_back(new_sample);</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;}</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::EmitRemainingSamples() {</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  DVLOG(LOG_LEVEL_ES) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::EmitRemainingBuffers&quot;</span>;</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  <span class="comment">// No buffer should be sent until fully initialized.</span></div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  <span class="keywordflow">if</span> (!is_initialized_)</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  <span class="comment">// Buffer emission.</span></div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator pid_iter = pids_.begin(); pid_iter != pids_.end();</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;       ++pid_iter) {</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;    SampleQueue&amp; sample_queue = pid_iter-&gt;second-&gt;sample_queue();</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;    <span class="keywordflow">for</span> (SampleQueue::iterator sample_iter = sample_queue.begin();</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;         sample_iter != sample_queue.end();</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;         ++sample_iter) {</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;      <span class="keywordflow">if</span> (!new_sample_cb_.Run(pid_iter-&gt;first, *sample_iter)) {</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;        <span class="comment">// Error processing sample. Propagate error condition.</span></div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;      }</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;    }</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;    sample_queue.clear();</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;  }</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;}</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_aa2aff12312827aacf2b7db6e2f792c52"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">shaka::media::mp2t::Mp2tMediaParser::Init</a></div><div class="ttdeci">void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00160">mp2t_media_parser.cc:160</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_afdb1a88116e3347e67afeb7715847135"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">shaka::media::mp2t::Mp2tMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00173">mp2t_media_parser.cc:173</a></div></div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="comment">// Flush the buffers and reset the pids.</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> <span class="keyword">auto</span>&amp; pair : pids_) {</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Flushing PID: &quot;</span> &lt;&lt; pair.first;</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    PidState* pid_state = pair.second.get();</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    pid_state-&gt;Flush();</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  }</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordtype">bool</span> result = EmitRemainingSamples();</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  pids_.clear();</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="comment">// Remove any bytes left in the TS buffer.</span></div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="comment">// (i.e. any partial TS packet =&gt; less than 188 bytes).</span></div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  ts_byte_queue_.Reset();</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="keywordflow">return</span> result;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;}</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div>
+<div class="line"><a name="l00188"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">  188</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">Mp2tMediaParser::Parse</a>(<span class="keyword">const</span> uint8_t* buf, <span class="keywordtype">int</span> size) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Parse size=&quot;</span> &lt;&lt; size;</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <span class="comment">// Add the data to the parser state.</span></div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  ts_byte_queue_.Push(buf, size);</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordflow">while</span> (<span class="keyword">true</span>) {</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="keyword">const</span> uint8_t* ts_buffer;</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    <span class="keywordtype">int</span> ts_buffer_size;</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    ts_byte_queue_.Peek(&amp;ts_buffer, &amp;ts_buffer_size);</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    <span class="keywordflow">if</span> (ts_buffer_size &lt; TsPacket::kPacketSize)</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    <span class="comment">// Synchronization.</span></div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    <span class="keywordtype">int</span> skipped_bytes = TsPacket::Sync(ts_buffer, ts_buffer_size);</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    <span class="keywordflow">if</span> (skipped_bytes &gt; 0) {</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Packet not aligned on a TS syncword:&quot;</span></div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;               &lt;&lt; <span class="stringliteral">&quot; skipped_bytes=&quot;</span> &lt;&lt; skipped_bytes;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;      ts_byte_queue_.Pop(skipped_bytes);</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    }</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    <span class="comment">// Parse the TS header, skipping 1 byte if the header is invalid.</span></div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    std::unique_ptr&lt;TsPacket&gt; ts_packet(</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;        TsPacket::Parse(ts_buffer, ts_buffer_size));</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keywordflow">if</span> (!ts_packet) {</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Error: invalid TS packet&quot;</span>;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;      ts_byte_queue_.Pop(1);</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    }</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    DVLOG(LOG_LEVEL_TS)</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;        &lt;&lt; <span class="stringliteral">&quot;Processing PID=&quot;</span> &lt;&lt; ts_packet-&gt;pid()</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;        &lt;&lt; <span class="stringliteral">&quot; start_unit=&quot;</span> &lt;&lt; ts_packet-&gt;payload_unit_start_indicator();</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    <span class="comment">// Parse the section.</span></div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    std::map&lt;int, std::unique_ptr&lt;PidState&gt;&gt;::iterator it =</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;        pids_.find(ts_packet-&gt;pid());</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    <span class="keywordflow">if</span> (it == pids_.end() &amp;&amp;</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;        ts_packet-&gt;pid() == TsSection::kPidPat) {</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;      <span class="comment">// Create the PAT state here if needed.</span></div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;      std::unique_ptr&lt;TsSection&gt; pat_section_parser(<span class="keyword">new</span> <a class="code" href="../../d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html">TsSectionPat</a>(</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;          base::Bind(&amp;Mp2tMediaParser::RegisterPmt, base::Unretained(<span class="keyword">this</span>))));</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;      std::unique_ptr&lt;PidState&gt; pat_pid_state(<span class="keyword">new</span> PidState(</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;          ts_packet-&gt;pid(), PidState::kPidPat, std::move(pat_section_parser)));</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;      pat_pid_state-&gt;Enable();</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;      it = pids_</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;               .insert(std::pair&lt;<span class="keywordtype">int</span>, std::unique_ptr&lt;PidState&gt;&gt;(</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;                   ts_packet-&gt;pid(), std::move(pat_pid_state)))</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;               .first;</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    }</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    <span class="keywordflow">if</span> (it != pids_.end()) {</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;      <span class="keywordflow">if</span> (!it-&gt;second-&gt;PushTsPacket(*ts_packet))</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;      DVLOG(LOG_LEVEL_TS) &lt;&lt; <span class="stringliteral">&quot;Ignoring TS packet for pid: &quot;</span> &lt;&lt; ts_packet-&gt;pid();</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    }</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    <span class="comment">// Go to the next packet.</span></div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;    ts_byte_queue_.Pop(TsPacket::kPacketSize);</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  }</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;  <span class="comment">// Emit the A/V buffers that kept accumulating during TS parsing.</span></div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  <span class="keywordflow">return</span> EmitRemainingSamples();</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;}</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::RegisterPmt(<span class="keywordtype">int</span> program_number, <span class="keywordtype">int</span> pmt_pid) {</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;RegisterPmt:&quot;</span></div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; program_number=&quot;</span> &lt;&lt; program_number</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pmt_pid=&quot;</span> &lt;&lt; pmt_pid;</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="comment">// Only one TS program is allowed. Ignore the incoming program map table,</span></div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;  <span class="comment">// if there is already one registered.</span></div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> <span class="keyword">auto</span>&amp; pair : pids_) {</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;    <span class="keywordflow">if</span> (pair.second-&gt;pid_type() == PidState::kPidPmt) {</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;      DVLOG_IF(1, pmt_pid != pair.first) &lt;&lt; <span class="stringliteral">&quot;More than one program is defined&quot;</span>;</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;      <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    }</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;  }</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;  <span class="comment">// Create the PMT state here if needed.</span></div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Create a new PMT parser&quot;</span>;</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  std::unique_ptr&lt;TsSection&gt; pmt_section_parser(<span class="keyword">new</span> TsSectionPmt(base::Bind(</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;      &amp;Mp2tMediaParser::RegisterPes, base::Unretained(<span class="keyword">this</span>), pmt_pid)));</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;  std::unique_ptr&lt;PidState&gt; pmt_pid_state(</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;      <span class="keyword">new</span> PidState(pmt_pid, PidState::kPidPmt, std::move(pmt_section_parser)));</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;  pmt_pid_state-&gt;Enable();</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  pids_.insert(std::pair&lt;<span class="keywordtype">int</span>, std::unique_ptr&lt;PidState&gt;&gt;(</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;      pmt_pid, std::move(pmt_pid_state)));</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;}</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::RegisterPes(<span class="keywordtype">int</span> pmt_pid,</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;                                  <span class="keywordtype">int</span> pes_pid,</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;                                  <span class="keywordtype">int</span> stream_type) {</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;RegisterPes:&quot;</span></div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pes_pid=&quot;</span> &lt;&lt; pes_pid</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; stream_type=&quot;</span> &lt;&lt; std::hex &lt;&lt; stream_type &lt;&lt; std::dec;</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;  std::map&lt;int, std::unique_ptr&lt;PidState&gt;&gt;::iterator it = pids_.find(pes_pid);</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  <span class="keywordflow">if</span> (it != pids_.end())</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <span class="comment">// Create a stream parser corresponding to the stream type.</span></div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;  <span class="keywordtype">bool</span> is_audio = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  std::unique_ptr&lt;EsParser&gt; es_parser;</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  <span class="keywordflow">if</span> (stream_type == kStreamTypeAVC) {</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;    es_parser.reset(</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;        <span class="keyword">new</span> EsParserH264(</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;            pes_pid,</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeHEVC) {</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    es_parser.reset(</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;        <span class="keyword">new</span> EsParserH265(</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;            pes_pid,</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeAAC) {</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    es_parser.reset(</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;        <span class="keyword">new</span> EsParserAdts(</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;            pes_pid,</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;            sbr_in_mimetype_));</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;    is_audio = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  }</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  <span class="comment">// Create the PES state here.</span></div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Create a new PES state&quot;</span>;</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  std::unique_ptr&lt;TsSection&gt; pes_section_parser(</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;      <span class="keyword">new</span> TsSectionPes(std::move(es_parser)));</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  PidState::PidType pid_type =</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;      is_audio ? PidState::kPidAudioPes : PidState::kPidVideoPes;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  std::unique_ptr&lt;PidState&gt; pes_pid_state(</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;      <span class="keyword">new</span> PidState(pes_pid, pid_type, std::move(pes_section_parser)));</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  pes_pid_state-&gt;Enable();</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;  pids_.insert(std::pair&lt;<span class="keywordtype">int</span>, std::unique_ptr&lt;PidState&gt;&gt;(</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;      pes_pid, std::move(pes_pid_state)));</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;}</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::OnNewStreamInfo(</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; new_stream_info) {</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;  DCHECK(new_stream_info);</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;OnVideoConfigChanged for pid=&quot;</span> &lt;&lt; new_stream_info-&gt;track_id();</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  PidMap::iterator pid_state = pids_.find(new_stream_info-&gt;track_id());</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;PID State for new stream not found (pid = &quot;</span></div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;               &lt;&lt; new_stream_info-&gt;track_id() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  }</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  <span class="comment">// Set the stream configuration information for the PID.</span></div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  pid_state-&gt;second-&gt;set_config(new_stream_info);</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  <span class="comment">// Finish initialization if all streams have configs.</span></div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  FinishInitializationIfNeeded();</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;}</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::FinishInitializationIfNeeded() {</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="comment">// Nothing to be done if already initialized.</span></div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="keywordflow">if</span> (is_initialized_)</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;  <span class="comment">// Wait for more data to come to finish initialization.</span></div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  <span class="keywordflow">if</span> (pids_.empty())</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;  std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt; all_stream_info;</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;  uint32_t num_es(0);</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator iter = pids_.begin(); iter != pids_.end();</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;       ++iter) {</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;    <span class="keywordflow">if</span> (((iter-&gt;second-&gt;pid_type() == PidState::kPidAudioPes) ||</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;         (iter-&gt;second-&gt;pid_type() == PidState::kPidVideoPes))) {</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      ++num_es;</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;      <span class="keywordflow">if</span> (iter-&gt;second-&gt;config())</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;        all_stream_info.push_back(iter-&gt;second-&gt;config());</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;    }</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;  }</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;  <span class="keywordflow">if</span> (num_es &amp;&amp; (all_stream_info.size() == num_es)) {</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;    <span class="comment">// All stream configurations have been received. Initialization can</span></div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;    <span class="comment">// be completed.</span></div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;    init_cb_.Run(all_stream_info);</div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mpeg2TS stream parser initialization done&quot;</span>;</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    is_initialized_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;  }</div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;}</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;<span class="keywordtype">void</span> Mp2tMediaParser::OnEmitSample(</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;    uint32_t pes_pid,</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; new_sample) {</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;  DCHECK(new_sample);</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;  DVLOG(LOG_LEVEL_ES)</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;OnEmitSample: &quot;</span></div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pid=&quot;</span></div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;      &lt;&lt; pes_pid</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; size=&quot;</span></div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;      &lt;&lt; new_sample-&gt;data_size()</div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; dts=&quot;</span></div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;      &lt;&lt; new_sample-&gt;dts()</div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pts=&quot;</span></div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;      &lt;&lt; new_sample-&gt;pts();</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  <span class="comment">// Add the sample to the appropriate PID sample queue.</span></div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  PidMap::iterator pid_state = pids_.find(pes_pid);</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;PID State for new sample not found (pid = &quot;</span></div>
+<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;               &lt;&lt; pes_pid &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  }</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  pid_state-&gt;second-&gt;sample_queue().push_back(new_sample);</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;}</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::EmitRemainingSamples() {</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  DVLOG(LOG_LEVEL_ES) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::EmitRemainingBuffers&quot;</span>;</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  <span class="comment">// No buffer should be sent until fully initialized.</span></div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  <span class="keywordflow">if</span> (!is_initialized_)</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  <span class="comment">// Buffer emission.</span></div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator pid_iter = pids_.begin(); pid_iter != pids_.end();</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;       ++pid_iter) {</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;    SampleQueue&amp; sample_queue = pid_iter-&gt;second-&gt;sample_queue();</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;    <span class="keywordflow">for</span> (SampleQueue::iterator sample_iter = sample_queue.begin();</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;         sample_iter != sample_queue.end();</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;         ++sample_iter) {</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;      <span class="keywordflow">if</span> (!new_sample_cb_.Run(pid_iter-&gt;first, *sample_iter)) {</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;        <span class="comment">// Error processing sample. Propagate error condition.</span></div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;      }</div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;    }</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;    sample_queue.clear();</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  }</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;}</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_aa2aff12312827aacf2b7db6e2f792c52"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">shaka::media::mp2t::Mp2tMediaParser::Init</a></div><div class="ttdeci">void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00157">mp2t_media_parser.cc:157</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_afdb1a88116e3347e67afeb7715847135"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">shaka::media::mp2t::Mp2tMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00170">mp2t_media_parser.cc:170</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSectionPat_html"><div class="ttname"><a href="../../d0/d26/classshaka_1_1media_1_1mp2t_1_1TsSectionPat.html">shaka::media::mp2t::TsSectionPat</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da0/ts__section__pat_8h_source.html#l00016">ts_section_pat.h:16</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_af1a8a33b4ce61777c876717b005d0026"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">shaka::media::mp2t::Mp2tMediaParser::Parse</a></div><div class="ttdeci">bool Parse(const uint8_t *buf, int size) override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00192">mp2t_media_parser.cc:192</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_af1a8a33b4ce61777c876717b005d0026"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">shaka::media::mp2t::Mp2tMediaParser::Parse</a></div><div class="ttdeci">bool Parse(const uint8_t *buf, int size) override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00188">mp2t_media_parser.cc:188</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html b/docs/d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html
index e797b4174b..547801967e 100644
--- a/docs/d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html
+++ b/docs/d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html
@@ -152,7 +152,7 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href=".
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d7d/webm__video__client_8cc_source.html b/docs/d1/d7d/webm__video__client_8cc_source.html
index f1e6da226c..3f34d363ea 100644
--- a/docs/d1/d7d/webm__video__client_8cc_source.html
+++ b/docs/d1/d7d/webm__video__client_8cc_source.html
@@ -94,183 +94,182 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_video_client.h&quot;</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/vp_codec_configuration_record.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_constants.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment">// Timestamps are represented in double in WebM. Convert to uint64_t in us.</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">const</span> uint32_t kWebMTimeScale = 1000000u;</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;int64_t GetGreatestCommonDivisor(int64_t a, int64_t b) {</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  <span class="keywordflow">while</span> (b) {</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;    int64_t temp = b;</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;    b = a % b;</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;    a = temp;</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  }</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keywordflow">return</span> a;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;}</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;WebMVideoClient::WebMVideoClient() {</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">Reset</a>();</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;}</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;WebMVideoClient::~WebMVideoClient() {</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;}</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">   38</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">WebMVideoClient::Reset</a>() {</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  pixel_width_ = -1;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  pixel_height_ = -1;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  crop_bottom_ = -1;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  crop_top_ = -1;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  crop_left_ = -1;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  crop_right_ = -1;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  display_width_ = -1;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  display_height_ = -1;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  display_unit_ = -1;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  alpha_mode_ = -1;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;}</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
-<div class="line"><a name="l00051"></a><span class="lineno"><a class="line" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">   51</a></span>&#160;scoped_refptr&lt;VideoStreamInfo&gt; <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">WebMVideoClient::GetVideoStreamInfo</a>(</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    int64_t track_num,</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keyword">const</span> std::string&amp; codec_id,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; codec_private,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <span class="keywordtype">bool</span> is_encrypted) {</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  Codec video_codec = kUnknownCodec;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP8&quot;</span>) {</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    video_codec = kCodecVP8;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP9&quot;</span>) {</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    video_codec = kCodecVP9;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="comment">// The codec private data is in WebM format, but needs to be converted to</span></div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="comment">// MP4 format.  Don&#39;t do it yet, it will be handled in</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="comment">// webm_cluster_parser.cc</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP10&quot;</span>) {</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    video_codec = kCodecVP10;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported video codec_id &quot;</span> &lt;&lt; codec_id;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  }</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">if</span> (pixel_width_ &lt;= 0 || pixel_height_ &lt;= 0)</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// Set crop and display unit defaults if these elements are not present.</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">if</span> (crop_bottom_ == -1)</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    crop_bottom_ = 0;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordflow">if</span> (crop_top_ == -1)</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    crop_top_ = 0;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">if</span> (crop_left_ == -1)</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    crop_left_ = 0;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordflow">if</span> (crop_right_ == -1)</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    crop_right_ = 0;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="keywordflow">if</span> (display_unit_ == -1)</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    display_unit_ = 0;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  uint16_t width_after_crop = pixel_width_ - (crop_left_ + crop_right_);</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  uint16_t height_after_crop = pixel_height_ - (crop_top_ + crop_bottom_);</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keywordflow">if</span> (display_unit_ == 0) {</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="keywordflow">if</span> (display_width_ &lt;= 0)</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;      display_width_ = width_after_crop;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="keywordflow">if</span> (display_height_ &lt;= 0)</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;      display_height_ = height_after_crop;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (display_unit_ == 3) {</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">if</span> (display_width_ &lt;= 0 || display_height_ &lt;= 0)</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported display unit type &quot;</span> &lt;&lt; display_unit_;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  }</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="comment">// Calculate sample aspect ratio.</span></div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  int64_t sar_x = display_width_ * height_after_crop;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  int64_t sar_y = display_height_ * width_after_crop;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  int64_t gcd = GetGreatestCommonDivisor(sar_x, sar_y);</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  sar_x /= gcd;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  sar_y /= gcd;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;(<span class="keyword">new</span> <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">VideoStreamInfo</a>(</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;      track_num, kWebMTimeScale, 0, video_codec, std::string(),</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;      codec_private.data(), codec_private.size(), width_after_crop,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      height_after_crop, sar_x, sar_y, 0, 0, std::string(), is_encrypted));</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;}</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) {</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  int64_t* dst = NULL;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordflow">switch</span> (<span class="keywordtype">id</span>) {</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelWidth:</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;      dst = &amp;pixel_width_;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelHeight:</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;      dst = &amp;pixel_height_;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropTop:</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;      dst = &amp;crop_top_;</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropBottom:</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;      dst = &amp;crop_bottom_;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropLeft:</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;      dst = &amp;crop_left_;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropRight:</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;      dst = &amp;crop_right_;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayWidth:</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;      dst = &amp;display_width_;</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayHeight:</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;      dst = &amp;display_height_;</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayUnit:</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;      dst = &amp;display_unit_;</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    <span class="keywordflow">case</span> kWebMIdAlphaMode:</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;      dst = &amp;alpha_mode_;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  }</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  <span class="keywordflow">if</span> (*dst != -1) {</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Multiple values for id &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="keywordtype">id</span> &lt;&lt; <span class="stringliteral">&quot; specified (&quot;</span></div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;               &lt;&lt; *dst &lt;&lt; <span class="stringliteral">&quot; and &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;)&quot;</span>;</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  }</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  *dst = val;</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;}</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size) {</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="comment">// Accept binary fields we don&#39;t care about for now.</span></div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;}</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) {</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="comment">// Accept float fields we don&#39;t care about for now.</span></div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;}</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00038">webm_video_client.cc:38</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00051">webm_video_client.cc:51</a></div></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/vp_codec_configuration_record.h&quot;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_constants.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment">// Timestamps are represented in double in WebM. Convert to uint64_t in us.</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="keyword">const</span> uint32_t kWebMTimeScale = 1000000u;</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;int64_t GetGreatestCommonDivisor(int64_t a, int64_t b) {</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;  <span class="keywordflow">while</span> (b) {</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;    int64_t temp = b;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;    b = a % b;</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;    a = temp;</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  }</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <span class="keywordflow">return</span> a;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;}</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;WebMVideoClient::WebMVideoClient() {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">Reset</a>();</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;}</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;WebMVideoClient::~WebMVideoClient() {</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;}</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
+<div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">   37</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">WebMVideoClient::Reset</a>() {</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  pixel_width_ = -1;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  pixel_height_ = -1;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  crop_bottom_ = -1;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  crop_top_ = -1;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  crop_left_ = -1;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  crop_right_ = -1;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  display_width_ = -1;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  display_height_ = -1;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  display_unit_ = -1;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  alpha_mode_ = -1;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;}</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
+<div class="line"><a name="l00050"></a><span class="lineno"><a class="line" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">   50</a></span>&#160;scoped_refptr&lt;VideoStreamInfo&gt; <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">WebMVideoClient::GetVideoStreamInfo</a>(</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    int64_t track_num,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">const</span> std::string&amp; codec_id,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; codec_private,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <span class="keywordtype">bool</span> is_encrypted) {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  Codec video_codec = kUnknownCodec;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP8&quot;</span>) {</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    video_codec = kCodecVP8;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP9&quot;</span>) {</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    video_codec = kCodecVP9;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    <span class="comment">// The codec private data is in WebM format, but needs to be converted to</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="comment">// MP4 format.  Don&#39;t do it yet, it will be handled in</span></div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="comment">// webm_cluster_parser.cc</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (codec_id == <span class="stringliteral">&quot;V_VP10&quot;</span>) {</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    video_codec = kCodecVP10;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported video codec_id &quot;</span> &lt;&lt; codec_id;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  }</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">if</span> (pixel_width_ &lt;= 0 || pixel_height_ &lt;= 0)</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// Set crop and display unit defaults if these elements are not present.</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordflow">if</span> (crop_bottom_ == -1)</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    crop_bottom_ = 0;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">if</span> (crop_top_ == -1)</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    crop_top_ = 0;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordflow">if</span> (crop_left_ == -1)</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    crop_left_ = 0;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keywordflow">if</span> (crop_right_ == -1)</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    crop_right_ = 0;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordflow">if</span> (display_unit_ == -1)</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    display_unit_ = 0;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  uint16_t width_after_crop = pixel_width_ - (crop_left_ + crop_right_);</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  uint16_t height_after_crop = pixel_height_ - (crop_top_ + crop_bottom_);</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordflow">if</span> (display_unit_ == 0) {</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">if</span> (display_width_ &lt;= 0)</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      display_width_ = width_after_crop;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">if</span> (display_height_ &lt;= 0)</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;      display_height_ = height_after_crop;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (display_unit_ == 3) {</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="keywordflow">if</span> (display_width_ &lt;= 0 || display_height_ &lt;= 0)</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;      <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unsupported display unit type &quot;</span> &lt;&lt; display_unit_;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;();</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  }</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="comment">// Calculate sample aspect ratio.</span></div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  int64_t sar_x = display_width_ * height_after_crop;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  int64_t sar_y = display_height_ * width_after_crop;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  int64_t gcd = GetGreatestCommonDivisor(sar_x, sar_y);</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  sar_x /= gcd;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  sar_y /= gcd;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keywordflow">return</span> scoped_refptr&lt;VideoStreamInfo&gt;(<span class="keyword">new</span> <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">VideoStreamInfo</a>(</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      track_num, kWebMTimeScale, 0, video_codec, std::string(),</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;      codec_private.data(), codec_private.size(), width_after_crop,</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;      height_after_crop, sar_x, sar_y, 0, 0, std::string(), is_encrypted));</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;}</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) {</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  int64_t* dst = NULL;</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">switch</span> (<span class="keywordtype">id</span>) {</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelWidth:</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;      dst = &amp;pixel_width_;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelHeight:</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;      dst = &amp;pixel_height_;</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropTop:</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;      dst = &amp;crop_top_;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropBottom:</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;      dst = &amp;crop_bottom_;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropLeft:</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;      dst = &amp;crop_left_;</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">case</span> kWebMIdPixelCropRight:</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;      dst = &amp;crop_right_;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayWidth:</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;      dst = &amp;display_width_;</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayHeight:</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;      dst = &amp;display_height_;</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    <span class="keywordflow">case</span> kWebMIdDisplayUnit:</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;      dst = &amp;display_unit_;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">case</span> kWebMIdAlphaMode:</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;      dst = &amp;alpha_mode_;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  }</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">if</span> (*dst != -1) {</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Multiple values for id &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="keywordtype">id</span> &lt;&lt; <span class="stringliteral">&quot; specified (&quot;</span></div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;               &lt;&lt; *dst &lt;&lt; <span class="stringliteral">&quot; and &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;)&quot;</span>;</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  }</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  *dst = val;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;}</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size) {</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="comment">// Accept binary fields we don&#39;t care about for now.</span></div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;}</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;<span class="keywordtype">bool</span> WebMVideoClient::OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="comment">// Accept float fields we don&#39;t care about for now.</span></div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;}</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00037">webm_video_client.cc:37</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00050">webm_video_client.cc:50</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">shaka::media::VideoStreamInfo</a></div><div class="ttdoc">Holds video stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00016">video_stream_info.h:16</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d81/structshaka_1_1media_1_1H265ReferencePictureSet-members.html b/docs/d1/d81/structshaka_1_1media_1_1H265ReferencePictureSet-members.html
index 2eac74b71b..fb437fc856 100644
--- a/docs/d1/d81/structshaka_1_1media_1_1H265ReferencePictureSet-members.html
+++ b/docs/d1/d81/structshaka_1_1media_1_1H265ReferencePictureSet-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d82/adts__constants_8h_source.html b/docs/d1/d82/adts__constants_8h_source.html
index 1522fca269..7dc854eee7 100644
--- a/docs/d1/d82/adts__constants_8h_source.html
+++ b/docs/d1/d82/adts__constants_8h_source.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d82/classshaka_1_1media_1_1WebMParserClient-members.html b/docs/d1/d82/classshaka_1_1media_1_1WebMParserClient-members.html
index b0a1a788a2..24c61d252f 100644
--- a/docs/d1/d82/classshaka_1_1media_1_1WebMParserClient-members.html
+++ b/docs/d1/d82/classshaka_1_1media_1_1WebMParserClient-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d86/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter-members.html b/docs/d1/d86/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter-members.html
index 88ab2ada0a..8f64bc2903 100644
--- a/docs/d1/d86/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter-members.html
+++ b/docs/d1/d86/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter-members.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d8e/webm__audio__client_8cc_source.html b/docs/d1/d8e/webm__audio__client_8cc_source.html
index d5c54f9adc..6c29f576ed 100644
--- a/docs/d1/d8e/webm__audio__client_8cc_source.html
+++ b/docs/d1/d8e/webm__audio__client_8cc_source.html
@@ -214,7 +214,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d91/classshaka_1_1media_1_1H26xBitReader-members.html b/docs/d1/d91/classshaka_1_1media_1_1H26xBitReader-members.html
index dd25572fc6..e8287ea67a 100644
--- a/docs/d1/d91/classshaka_1_1media_1_1H26xBitReader-members.html
+++ b/docs/d1/d91/classshaka_1_1media_1_1H26xBitReader-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d9d/classshaka_1_1media_1_1ByteQueue-members.html b/docs/d1/d9d/classshaka_1_1media_1_1ByteQueue-members.html
index ea78bccb24..7611196572 100644
--- a/docs/d1/d9d/classshaka_1_1media_1_1ByteQueue-members.html
+++ b/docs/d1/d9d/classshaka_1_1media_1_1ByteQueue-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d9d/tracks__builder_8h_source.html b/docs/d1/d9d/tracks__builder_8h_source.html
index dde17e7360..fcb4070ff7 100644
--- a/docs/d1/d9d/tracks__builder_8h_source.html
+++ b/docs/d1/d9d/tracks__builder_8h_source.html
@@ -210,7 +210,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/d9e/structshaka_1_1media_1_1mp4_1_1CodecConfiguration-members.html b/docs/d1/d9e/structshaka_1_1media_1_1mp4_1_1CodecConfiguration-members.html
index abaffb7cae..87d3eb8e86 100644
--- a/docs/d1/d9e/structshaka_1_1media_1_1mp4_1_1CodecConfiguration-members.html
+++ b/docs/d1/d9e/structshaka_1_1media_1_1mp4_1_1CodecConfiguration-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html b/docs/d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html
index 5f7cdb41fe..b0cae823f0 100644
--- a/docs/d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html
+++ b/docs/d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html
@@ -589,7 +589,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>ReadWriteInt64</b> (i
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/da1/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample.html b/docs/d1/da1/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample.html
index f7065ab9f2..7f3d86441b 100644
--- a/docs/d1/da1/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample.html
+++ b/docs/d1/da1/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample.html
@@ -116,7 +116,7 @@ scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaS
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/da2/classshaka_1_1media_1_1NalUnitToByteStreamConverter-members.html b/docs/d1/da2/classshaka_1_1media_1_1NalUnitToByteStreamConverter-members.html
index 8055f99a39..313c479f1f 100644
--- a/docs/d1/da2/classshaka_1_1media_1_1NalUnitToByteStreamConverter-members.html
+++ b/docs/d1/da2/classshaka_1_1media_1_1NalUnitToByteStreamConverter-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/da5/classshaka_1_1media_1_1VPCodecConfigurationRecord.html b/docs/d1/da5/classshaka_1_1media_1_1VPCodecConfigurationRecord.html
index 0be0dd6f7a..6be94ad53e 100644
--- a/docs/d1/da5/classshaka_1_1media_1_1VPCodecConfigurationRecord.html
+++ b/docs/d1/da5/classshaka_1_1media_1_1VPCodecConfigurationRecord.html
@@ -306,7 +306,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>video_full_range_flag
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html b/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html
index 4a69e8b6fe..abc25f74d3 100644
--- a/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html
+++ b/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html
@@ -100,12 +100,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Parse</a>()</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">Run</a>()</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">SetKeySource</a>(std::unique_ptr&lt; KeySource &gt; key_source)</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>()</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a>()</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~Demuxer</b>() (defined in <a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a>)</td><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/db0/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader.html b/docs/d1/db0/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader.html
index a022936626..0e1c6f4996 100644
--- a/docs/d1/db0/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader.html
+++ b/docs/d1/db0/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader.html
@@ -191,7 +191,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/db2/decoder__configuration__record_8h_source.html b/docs/d1/db2/decoder__configuration__record_8h_source.html
index cb4e73bd50..82fc772ad9 100644
--- a/docs/d1/db2/decoder__configuration__record_8h_source.html
+++ b/docs/d1/db2/decoder__configuration__record_8h_source.html
@@ -166,7 +166,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dc2/h26x__bit__reader_8h_source.html b/docs/d1/dc2/h26x__bit__reader_8h_source.html
index 13ecc0bd6a..2f16ea7a5b 100644
--- a/docs/d1/dc2/h26x__bit__reader_8h_source.html
+++ b/docs/d1/dc2/h26x__bit__reader_8h_source.html
@@ -192,7 +192,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dcb/encrypting__fragmenter_8h_source.html b/docs/d1/dcb/encrypting__fragmenter_8h_source.html
index 9083fcb32f..f4603d9f7f 100644
--- a/docs/d1/dcb/encrypting__fragmenter_8h_source.html
+++ b/docs/d1/dcb/encrypting__fragmenter_8h_source.html
@@ -195,7 +195,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html b/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html
index 3ba277295c..4a38010ba4 100644
--- a/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html
+++ b/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html
@@ -116,7 +116,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>size</b> () const </td
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dd6/structshaka_1_1media_1_1mp4_1_1DataInformation-members.html b/docs/d1/dd6/structshaka_1_1media_1_1mp4_1_1DataInformation-members.html
index 5182acb3dc..fd3737ecc9 100644
--- a/docs/d1/dd6/structshaka_1_1media_1_1mp4_1_1DataInformation-members.html
+++ b/docs/d1/dd6/structshaka_1_1media_1_1mp4_1_1DataInformation-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de2/classshaka_1_1media_1_1VideoStreamInfo-members.html b/docs/d1/de2/classshaka_1_1media_1_1VideoStreamInfo-members.html
index 30ee088ef5..8df9262f54 100644
--- a/docs/d1/de2/classshaka_1_1media_1_1VideoStreamInfo-members.html
+++ b/docs/d1/de2/classshaka_1_1media_1_1VideoStreamInfo-members.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de2/composition__offset__iterator_8cc_source.html b/docs/d1/de2/composition__offset__iterator_8cc_source.html
index 3ba661ff33..39e2076750 100644
--- a/docs/d1/de2/composition__offset__iterator_8cc_source.html
+++ b/docs/d1/de2/composition__offset__iterator_8cc_source.html
@@ -159,7 +159,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de4/classshaka_1_1media_1_1KeyFetcher-members.html b/docs/d1/de4/classshaka_1_1media_1_1KeyFetcher-members.html
index 2f50c5578e..b4067a326b 100644
--- a/docs/d1/de4/classshaka_1_1media_1_1KeyFetcher-members.html
+++ b/docs/d1/de4/classshaka_1_1media_1_1KeyFetcher-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html b/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html
index dd4e032a7f..3bdbb499df 100644
--- a/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html
+++ b/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html
@@ -186,7 +186,7 @@ Additional Inherited Members</h2></td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00204">204</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00203">203</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -197,7 +197,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de7/structshaka_1_1media_1_1H265ReferencePictureListModifications-members.html b/docs/d1/de7/structshaka_1_1media_1_1H265ReferencePictureListModifications-members.html
index 9196609e0e..4c8e98ce7e 100644
--- a/docs/d1/de7/structshaka_1_1media_1_1H265ReferencePictureListModifications-members.html
+++ b/docs/d1/de7/structshaka_1_1media_1_1H265ReferencePictureListModifications-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/de9/classshaka_1_1media_1_1ProgressListener-members.html b/docs/d1/de9/classshaka_1_1media_1_1ProgressListener-members.html
index b73bb438ca..b88b424053 100644
--- a/docs/d1/de9/classshaka_1_1media_1_1ProgressListener-members.html
+++ b/docs/d1/de9/classshaka_1_1media_1_1ProgressListener-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html b/docs/d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html
index 8bab074187..3ca59a7b95 100644
--- a/docs/d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html
+++ b/docs/d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html
@@ -468,7 +468,7 @@ template&lt;typename T &gt; </div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/dee/structshaka_1_1media_1_1mp4_1_1SampleTable.html b/docs/d1/dee/structshaka_1_1media_1_1mp4_1_1SampleTable.html
index d1660fd492..bc240fe385 100644
--- a/docs/d1/dee/structshaka_1_1media_1_1mp4_1_1SampleTable.html
+++ b/docs/d1/dee/structshaka_1_1media_1_1mp4_1_1SampleTable.html
@@ -198,7 +198,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/df0/aes__encryptor_8h_source.html b/docs/d1/df0/aes__encryptor_8h_source.html
index de7e324654..561e3cb827 100644
--- a/docs/d1/df0/aes__encryptor_8h_source.html
+++ b/docs/d1/df0/aes__encryptor_8h_source.html
@@ -194,7 +194,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/df3/structshaka_1_1MpdOptions.html b/docs/d1/df3/structshaka_1_1MpdOptions.html
index a05ecfc097..7787114960 100644
--- a/docs/d1/df3/structshaka_1_1MpdOptions.html
+++ b/docs/d1/df3/structshaka_1_1MpdOptions.html
@@ -127,7 +127,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>suggested_presentat
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/df5/nalu__reader_8cc_source.html b/docs/d1/df5/nalu__reader_8cc_source.html
index 8db5c5543a..314a1e3994 100644
--- a/docs/d1/df5/nalu__reader_8cc_source.html
+++ b/docs/d1/df5/nalu__reader_8cc_source.html
@@ -428,7 +428,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d1/df9/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader-members.html b/docs/d1/df9/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader-members.html
index 85b65274ab..3c2446f98a 100644
--- a/docs/d1/df9/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader-members.html
+++ b/docs/d1/df9/structshaka_1_1media_1_1mp4_1_1VideoMediaHeader-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d02/timestamp_8h_source.html b/docs/d2/d02/timestamp_8h_source.html
index 98a95f34f7..01f16a55bd 100644
--- a/docs/d2/d02/timestamp_8h_source.html
+++ b/docs/d2/d02/timestamp_8h_source.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d0b/classshaka_1_1media_1_1SeekHead-members.html b/docs/d2/d0b/classshaka_1_1media_1_1SeekHead-members.html
index 3e271ad011..d7d865ca69 100644
--- a/docs/d2/d0b/classshaka_1_1media_1_1SeekHead-members.html
+++ b/docs/d2/d0b/classshaka_1_1media_1_1SeekHead-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html b/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html
index fb4f2a08bb..76c1ad1822 100644
--- a/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html
+++ b/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d0f/structshaka_1_1media_1_1wvm_1_1PrevSampleData.html b/docs/d2/d0f/structshaka_1_1media_1_1wvm_1_1PrevSampleData.html
index 2b240fccdd..454be5325b 100644
--- a/docs/d2/d0f/structshaka_1_1media_1_1wvm_1_1PrevSampleData.html
+++ b/docs/d2/d0f/structshaka_1_1media_1_1wvm_1_1PrevSampleData.html
@@ -132,7 +132,7 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>video_sample_durat
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d11/classshaka_1_1media_1_1MuxerListener-members.html b/docs/d2/d11/classshaka_1_1media_1_1MuxerListener-members.html
index 9b2794f275..e4038927fb 100644
--- a/docs/d2/d11/classshaka_1_1media_1_1MuxerListener-members.html
+++ b/docs/d2/d11/classshaka_1_1media_1_1MuxerListener-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d17/ts__section__pat_8cc_source.html b/docs/d2/d17/ts__section__pat_8cc_source.html
index fbe3ff51b7..9d0805a4d3 100644
--- a/docs/d2/d17/ts__section__pat_8cc_source.html
+++ b/docs/d2/d17/ts__section__pat_8cc_source.html
@@ -214,7 +214,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d23/threaded__io__file_8cc_source.html b/docs/d2/d23/threaded__io__file_8cc_source.html
index e57032d804..94b0d5f877 100644
--- a/docs/d2/d23/threaded__io__file_8cc_source.html
+++ b/docs/d2/d23/threaded__io__file_8cc_source.html
@@ -317,7 +317,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d24/packager__util_8h_source.html b/docs/d2/d24/packager__util_8h_source.html
index de82af3491..76d7b23fc5 100644
--- a/docs/d2/d24/packager__util_8h_source.html
+++ b/docs/d2/d24/packager__util_8h_source.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">class </span>Muxer;</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">struct </span>MuxerOptions;</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keywordtype">void</span> DumpStreamInfo(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams);</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keywordtype">void</span> DumpStreamInfo(<span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams);</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;std::unique_ptr&lt;KeySource&gt; CreateEncryptionKeySource();</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
@@ -128,7 +128,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="keywordtype">bool</span> GetMpdOptions(MpdOptions* mpd_options);</div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="keywordtype">bool</span> AddStreamToMuxer(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="keywordtype">bool</span> AddStreamToMuxer(<span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; streams,</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                      <span class="keyword">const</span> std::string&amp; stream_selector,</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                      <span class="keyword">const</span> std::string&amp; language_override,</div>
 <div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                      Muxer* muxer);</div>
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html b/docs/d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html
index cc5d7a5aca..e498c33168 100644
--- a/docs/d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html
+++ b/docs/d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html
@@ -328,7 +328,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d30/tracks__builder_8cc_source.html b/docs/d2/d30/tracks__builder_8cc_source.html
index 4e47bbf464..a1bbe7ef21 100644
--- a/docs/d2/d30/tracks__builder_8cc_source.html
+++ b/docs/d2/d30/tracks__builder_8cc_source.html
@@ -487,7 +487,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d33/video__slice__header__parser_8h_source.html b/docs/d2/d33/video__slice__header__parser_8h_source.html
index 700efb1ddf..197f7cc75e 100644
--- a/docs/d2/d33/video__slice__header__parser_8h_source.html
+++ b/docs/d2/d33/video__slice__header__parser_8h_source.html
@@ -153,7 +153,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="preprocessor">#endif  // MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_</span></div>
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="preprocessor"></span></div>
 <div class="ttc" id="classshaka_1_1media_1_1H265VideoSliceHeaderParser_html"><div class="ttname"><a href="../../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html">shaka::media::H265VideoSliceHeaderParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d33/video__slice__header__parser_8h_source.html#l00053">video_slice_header_parser.h:53</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H264Parser_html"><div class="ttname"><a href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">shaka::media::H264Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00244">h264_parser.h:244</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H264Parser_html"><div class="ttname"><a href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">shaka::media::H264Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00245">h264_parser.h:245</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoSliceHeaderParser_html_a3346c5afaf83a18cfcf688c36049d586"><div class="ttname"><a href="../../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a3346c5afaf83a18cfcf688c36049d586">shaka::media::VideoSliceHeaderParser::GetHeaderSize</a></div><div class="ttdeci">virtual int64_t GetHeaderSize(const Nalu &amp;nalu)=0</div><div class="ttdoc">Gets the header size of the given NALU. Returns &lt; 0 on error. </div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H264VideoSliceHeaderParser_html_a5957ea62985810662158c02a163aac60"><div class="ttname"><a href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a5957ea62985810662158c02a163aac60">shaka::media::H264VideoSliceHeaderParser::GetHeaderSize</a></div><div class="ttdeci">int64_t GetHeaderSize(const Nalu &amp;nalu) override</div><div class="ttdoc">Gets the header size of the given NALU. Returns &lt; 0 on error. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d35/video__slice__header__parser_8cc_source.html#l00048">video_slice_header_parser.cc:48</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H265VideoSliceHeaderParser_html_a54459b6748f64be2bd328c5af79798f3"><div class="ttname"><a href="../../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a54459b6748f64be2bd328c5af79798f3">shaka::media::H265VideoSliceHeaderParser::GetHeaderSize</a></div><div class="ttdeci">int64_t GetHeaderSize(const Nalu &amp;nalu) override</div><div class="ttdoc">Gets the header size of the given NALU. Returns &lt; 0 on error. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d35/video__slice__header__parser_8cc_source.html#l00083">video_slice_header_parser.cc:83</a></div></div>
@@ -167,7 +167,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html b/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html
index a228441742..f0f519e6ee 100644
--- a/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html
+++ b/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d3c/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader-members.html b/docs/d2/d3c/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader-members.html
index a4da200e71..ff04d345f7 100644
--- a/docs/d2/d3c/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader-members.html
+++ b/docs/d2/d3c/structshaka_1_1media_1_1mp4_1_1TrackFragmentHeader-members.html
@@ -133,7 +133,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d45/program__map__table__writer_8cc_source.html b/docs/d2/d45/program__map__table__writer_8cc_source.html
index 9d18ad41b7..0030175e00 100644
--- a/docs/d2/d45/program__map__table__writer_8cc_source.html
+++ b/docs/d2/d45/program__map__table__writer_8cc_source.html
@@ -500,7 +500,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d4c/nal__unit__to__byte__stream__converter_8cc_source.html b/docs/d2/d4c/nal__unit__to__byte__stream__converter_8cc_source.html
index 1a8b0b3236..15e29307eb 100644
--- a/docs/d2/d4c/nal__unit__to__byte__stream__converter_8cc_source.html
+++ b/docs/d2/d4c/nal__unit__to__byte__stream__converter_8cc_source.html
@@ -291,7 +291,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d4d/file_8h_source.html b/docs/d2/d4d/file_8h_source.html
index 51c9d9f9be..b552b71320 100644
--- a/docs/d2/d4d/file_8h_source.html
+++ b/docs/d2/d4d/file_8h_source.html
@@ -191,7 +191,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d4f/structshaka_1_1Element-members.html b/docs/d2/d4f/structshaka_1_1Element-members.html
index d35710728a..cdf7b10b31 100644
--- a/docs/d2/d4f/structshaka_1_1Element-members.html
+++ b/docs/d2/d4f/structshaka_1_1Element-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d51/classshaka_1_1MockMpdNotifier-members.html b/docs/d2/d51/classshaka_1_1MockMpdNotifier-members.html
index e75a812e8f..e29997e662 100644
--- a/docs/d2/d51/classshaka_1_1MockMpdNotifier-members.html
+++ b/docs/d2/d51/classshaka_1_1MockMpdNotifier-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html b/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html
index 4abd3f8462..54c9f84da2 100644
--- a/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html
+++ b/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html
@@ -268,7 +268,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>slice_beta_offset_div2
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00143">143</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00144">144</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following files:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 <li>media/codecs/<a class="el" href="../../dc/d7b/h264__parser_8cc_source.html">h264_parser.cc</a></li>
@@ -276,7 +276,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>slice_beta_offset_div2
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d5b/classshaka_1_1media_1_1KeySource-members.html b/docs/d2/d5b/classshaka_1_1media_1_1KeySource-members.html
index 82b3bae69d..3348a9a8d5 100644
--- a/docs/d2/d5b/classshaka_1_1media_1_1KeySource-members.html
+++ b/docs/d2/d5b/classshaka_1_1media_1_1KeySource-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d5c/classshaka_1_1SimpleMpdNotifier-members.html b/docs/d2/d5c/classshaka_1_1SimpleMpdNotifier-members.html
index c2e5fa2967..2003c51a91 100644
--- a/docs/d2/d5c/classshaka_1_1SimpleMpdNotifier-members.html
+++ b/docs/d2/d5c/classshaka_1_1SimpleMpdNotifier-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d61/structshaka_1_1media_1_1H264ModificationOfPicNum-members.html b/docs/d2/d61/structshaka_1_1media_1_1H264ModificationOfPicNum-members.html
index 2fa83e2a72..90ef740ee1 100644
--- a/docs/d2/d61/structshaka_1_1media_1_1H264ModificationOfPicNum-members.html
+++ b/docs/d2/d61/structshaka_1_1media_1_1H264ModificationOfPicNum-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d62/simple__mpd__notifier_8h_source.html b/docs/d2/d62/simple__mpd__notifier_8h_source.html
index a678860354..2d7ad4e100 100644
--- a/docs/d2/d62/simple__mpd__notifier_8h_source.html
+++ b/docs/d2/d62/simple__mpd__notifier_8h_source.html
@@ -170,23 +170,23 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_SIMPLE_MPD_NOTIFIER_H_</span></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a59bcb401b5ca8d5b893ec7da9461569f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">shaka::SimpleMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00034">simple_mpd_notifier.cc:34</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00058">mpd_builder.h:58</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a59bcb401b5ca8d5b893ec7da9461569f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">shaka::SimpleMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00035">simple_mpd_notifier.cc:35</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00057">mpd_builder.h:57</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a6aa87b45fb2117fba72c86c37ad2b1b2"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">shaka::SimpleMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00115">simple_mpd_notifier.cc:115</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a6aa87b45fb2117fba72c86c37ad2b1b2"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">shaka::SimpleMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00116">simple_mpd_notifier.cc:116</a></div></div>
 <div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html">shaka::SimpleMpdNotifier</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d62/simple__mpd__notifier_8h_source.html#l00031">simple_mpd_notifier.h:31</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a640f5455a6d64063c364b81a8a6e878a"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">shaka::SimpleMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00085">simple_mpd_notifier.cc:85</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a8ea622a21a5807775bb2d998fa04658f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">shaka::SimpleMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00128">simple_mpd_notifier.cc:128</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ad876de8c9909394b6fb47f387066fc83"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">shaka::SimpleMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00073">simple_mpd_notifier.cc:73</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a640f5455a6d64063c364b81a8a6e878a"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">shaka::SimpleMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00086">simple_mpd_notifier.cc:86</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a8ea622a21a5807775bb2d998fa04658f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">shaka::SimpleMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00129">simple_mpd_notifier.cc:129</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ad876de8c9909394b6fb47f387066fc83"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">shaka::SimpleMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00074">simple_mpd_notifier.cc:74</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdNotifier_html"><div class="ttname"><a href="../../d3/dd0/classshaka_1_1MpdNotifier.html">shaka::MpdNotifier</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d15/mpd__notifier_8h_source.html#l00032">mpd_notifier.h:32</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdNotifier_html_a3eb0f05b01d475eff0a75bab71f21149"><div class="ttname"><a href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a3eb0f05b01d475eff0a75bab71f21149">shaka::MpdNotifier::dash_profile</a></div><div class="ttdeci">DashProfile dash_profile() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d15/mpd__notifier_8h_source.html#l00108">mpd_notifier.h:108</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ae1a1231fb13e0bc97cdea5fc239184bf"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">shaka::SimpleMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00099">simple_mpd_notifier.cc:99</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ae1a1231fb13e0bc97cdea5fc239184bf"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">shaka::SimpleMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00100">simple_mpd_notifier.cc:100</a></div></div>
 <div class="ttc" id="structshaka_1_1MpdOptions_html"><div class="ttname"><a href="../../d1/df3/structshaka_1_1MpdOptions.html">shaka::MpdOptions</a></div><div class="ttdoc">Defines Mpd Options. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d60/mpd__options_8h_source.html#l00015">mpd_options.h:15</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a3f4aabd86ec08e5ff427120ed39fda29"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">shaka::SimpleMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00038">simple_mpd_notifier.cc:38</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a3f4aabd86ec08e5ff427120ed39fda29"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">shaka::SimpleMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00039">simple_mpd_notifier.cc:39</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d62/structshaka_1_1media_1_1mp4_1_1Movie-members.html b/docs/d2/d62/structshaka_1_1media_1_1mp4_1_1Movie-members.html
index e15579fdc8..e04bd72b6f 100644
--- a/docs/d2/d62/structshaka_1_1media_1_1mp4_1_1Movie-members.html
+++ b/docs/d2/d62/structshaka_1_1media_1_1mp4_1_1Movie-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d6a/classshaka_1_1media_1_1AesCryptor-members.html b/docs/d2/d6a/classshaka_1_1media_1_1AesCryptor-members.html
index 736ff7c16e..7efefe8e15 100644
--- a/docs/d2/d6a/classshaka_1_1media_1_1AesCryptor-members.html
+++ b/docs/d2/d6a/classshaka_1_1media_1_1AesCryptor-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d6f/classBandwidthEstimator.html b/docs/d2/d6f/classBandwidthEstimator.html
index e89381a44d..3854e7d15d 100644
--- a/docs/d2/d6f/classBandwidthEstimator.html
+++ b/docs/d2/d6f/classBandwidthEstimator.html
@@ -151,7 +151,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><b>kUseAllBl
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d70/structshaka_1_1media_1_1mp4_1_1SchemeInfo.html b/docs/d2/d70/structshaka_1_1media_1_1mp4_1_1SchemeInfo.html
index 9fac417555..71bf2a5efa 100644
--- a/docs/d2/d70/structshaka_1_1media_1_1mp4_1_1SchemeInfo.html
+++ b/docs/d2/d70/structshaka_1_1media_1_1mp4_1_1SchemeInfo.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d7b/classshaka_1_1DashIopMpdNotifier-members.html b/docs/d2/d7b/classshaka_1_1DashIopMpdNotifier-members.html
index 8cb3469d2c..4698aa72f9 100644
--- a/docs/d2/d7b/classshaka_1_1DashIopMpdNotifier-members.html
+++ b/docs/d2/d7b/classshaka_1_1DashIopMpdNotifier-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d7b/simple__mpd__notifier_8cc_source.html b/docs/d2/d7b/simple__mpd__notifier_8cc_source.html
index a708de582f..169c52e6c9 100644
--- a/docs/d2/d7b/simple__mpd__notifier_8cc_source.html
+++ b/docs/d2/d7b/simple__mpd__notifier_8cc_source.html
@@ -96,150 +96,151 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/simple_mpd_notifier.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_builder.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_notifier_util.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_utils.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;SimpleMpdNotifier::SimpleMpdNotifier(DashProfile dash_profile,</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;                                     <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;                                     <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                                     <span class="keyword">const</span> std::string&amp; output_path)</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;    : MpdNotifier(dash_profile),</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;      output_path_(output_path),</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      mpd_builder_(new MpdBuilder(dash_profile == kLiveProfile</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                                      ? MpdBuilder::kDynamic</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                                      : MpdBuilder::kStatic,</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                                  mpd_options)) {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  DCHECK(dash_profile == kLiveProfile || dash_profile == kOnDemandProfile);</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; base_urls.size(); ++i)</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    mpd_builder_-&gt;AddBaseUrl(base_urls[i]);</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;}</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;SimpleMpdNotifier::~SimpleMpdNotifier() {</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;}</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">   34</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">SimpleMpdNotifier::Init</a>() {</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;}</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">   38</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">SimpleMpdNotifier::NotifyNewContainer</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                                           uint32_t* container_id) {</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  DCHECK(container_id);</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  ContentType content_type = <a class="code" href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">GetContentType</a>(media_info);</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordflow">if</span> (content_type == kContentTypeUnknown)</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="comment">// TODO(kqyang): Consider adding a new method MpdBuilder::AddRepresentation.</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="comment">// Most of the codes here can be moved inside.</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  std::string key = GetAdaptationSetKey(media_info);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  std::string lang = GetLanguage(media_info);</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>** adaptation_set = &amp;adaptation_set_map_[key];</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">if</span> (*adaptation_set == NULL)</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    *adaptation_set = mpd_builder_-&gt;AddAdaptationSet(lang);</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  DCHECK(*adaptation_set);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  MediaInfo adjusted_media_info(media_info);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(output_path_, &amp;adjusted_media_info);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* representation =</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      (*adaptation_set)-&gt;AddRepresentation(adjusted_media_info);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordflow">if</span> (representation == NULL)</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="comment">// For SimpleMpdNotifier, just put it in Representation. It should still</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="comment">// generate a valid MPD.</span></div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <a class="code" href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">AddContentProtectionElements</a>(media_info, representation);</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  *container_id = representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>();</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  DCHECK(!ContainsKey(representation_map_, representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()));</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  representation_map_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = representation;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;}</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">   73</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">SimpleMpdNotifier::NotifySampleDuration</a>(uint32_t container_id,</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                                             uint32_t sample_duration) {</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  }</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  it-&gt;second-&gt;SetSampleDuration(sample_duration);</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;}</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">   85</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">SimpleMpdNotifier::NotifyNewSegment</a>(uint32_t container_id,</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                                         uint64_t start_time,</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;                                         uint64_t duration,</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;                                         uint64_t size) {</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  }</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  it-&gt;second-&gt;AddNewSegment(start_time, duration, size);</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;}</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;</div>
-<div class="line"><a name="l00099"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">   99</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">SimpleMpdNotifier::NotifyEncryptionUpdate</a>(</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    uint32_t container_id,</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_key_id,</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_pssh) {</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  }</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  it-&gt;second-&gt;UpdateContentProtectionPssh(drm_uuid,</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;                                          <a class="code" href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">Uint8VectorToBase64</a>(new_pssh));</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
-<div class="line"><a name="l00115"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">  115</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">SimpleMpdNotifier::AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    uint32_t container_id,</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  }</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  it-&gt;second-&gt;AddContentProtectionElement(content_protection_element);</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
-<div class="line"><a name="l00128"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">  128</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">SimpleMpdNotifier::Flush</a>() {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">WriteMpdToFile</a>(output_path_, mpd_builder_.get());</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;}</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a59bcb401b5ca8d5b893ec7da9461569f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">shaka::SimpleMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00034">simple_mpd_notifier.cc:34</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00503">mpd_builder.h:503</a></div></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_builder.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_notifier_util.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_utils.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;SimpleMpdNotifier::SimpleMpdNotifier(DashProfile dash_profile,</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;                                     <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                                     <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                                     <span class="keyword">const</span> std::string&amp; output_path)</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;    : MpdNotifier(dash_profile),</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      output_path_(output_path),</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;      mpd_builder_(new MpdBuilder(dash_profile == kLiveProfile</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                                      ? MpdBuilder::kDynamic</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                                      : MpdBuilder::kStatic,</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                                  mpd_options)) {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  DCHECK(dash_profile == kLiveProfile || dash_profile == kOnDemandProfile);</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; base_urls.size(); ++i)</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    mpd_builder_-&gt;AddBaseUrl(base_urls[i]);</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;}</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;SimpleMpdNotifier::~SimpleMpdNotifier() {</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;}</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
+<div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">   35</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">SimpleMpdNotifier::Init</a>() {</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;}</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">   39</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">SimpleMpdNotifier::NotifyNewContainer</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                                           uint32_t* container_id) {</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  DCHECK(container_id);</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  ContentType content_type = <a class="code" href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">GetContentType</a>(media_info);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordflow">if</span> (content_type == kContentTypeUnknown)</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="comment">// TODO(kqyang): Consider adding a new method MpdBuilder::AddRepresentation.</span></div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="comment">// Most of the codes here can be moved inside.</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  std::string key = GetAdaptationSetKey(media_info);</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  std::string lang = GetLanguage(media_info);</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>** adaptation_set = &amp;adaptation_set_map_[key];</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordflow">if</span> (*adaptation_set == NULL)</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    *adaptation_set = mpd_builder_-&gt;AddAdaptationSet(lang);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  DCHECK(*adaptation_set);</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  MediaInfo adjusted_media_info(media_info);</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(output_path_, &amp;adjusted_media_info);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* representation =</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      (*adaptation_set)-&gt;AddRepresentation(adjusted_media_info);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordflow">if</span> (representation == NULL)</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="comment">// For SimpleMpdNotifier, just put it in Representation. It should still</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="comment">// generate a valid MPD.</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <a class="code" href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">AddContentProtectionElements</a>(media_info, representation);</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  *container_id = representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>();</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  DCHECK(!ContainsKey(representation_map_, representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()));</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  representation_map_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = representation;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;}</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">   74</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">SimpleMpdNotifier::NotifySampleDuration</a>(uint32_t container_id,</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                                             uint32_t sample_duration) {</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  }</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  it-&gt;second-&gt;SetSampleDuration(sample_duration);</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;}</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
+<div class="line"><a name="l00086"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">   86</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">SimpleMpdNotifier::NotifyNewSegment</a>(uint32_t container_id,</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;                                         uint64_t start_time,</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;                                         uint64_t duration,</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;                                         uint64_t size) {</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  }</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  it-&gt;second-&gt;AddNewSegment(start_time, duration, size);</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;}</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div>
+<div class="line"><a name="l00100"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">  100</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">SimpleMpdNotifier::NotifyEncryptionUpdate</a>(</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    uint32_t container_id,</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_key_id,</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_pssh) {</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  }</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  it-&gt;second-&gt;UpdateContentProtectionPssh(drm_uuid,</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;                                          <a class="code" href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">Uint8VectorToBase64</a>(new_pssh));</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
+<div class="line"><a name="l00116"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">  116</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">SimpleMpdNotifier::AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    uint32_t container_id,</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  }</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  it-&gt;second-&gt;AddContentProtectionElement(content_protection_element);</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;}</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
+<div class="line"><a name="l00129"></a><span class="lineno"><a class="line" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">  129</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">SimpleMpdNotifier::Flush</a>() {</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">WriteMpdToFile</a>(output_path_, mpd_builder_.get());</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;}</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a59bcb401b5ca8d5b893ec7da9461569f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f">shaka::SimpleMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00035">simple_mpd_notifier.cc:35</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00500">mpd_builder.h:500</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a6aa87b45fb2117fba72c86c37ad2b1b2"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">shaka::SimpleMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00115">simple_mpd_notifier.cc:115</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a6aa87b45fb2117fba72c86c37ad2b1b2"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a6aa87b45fb2117fba72c86c37ad2b1b2">shaka::SimpleMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00116">simple_mpd_notifier.cc:116</a></div></div>
 <div class="ttc" id="namespaceshaka_html_abfd977a0dfb051a942d1694442692814"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">shaka::AddContentProtectionElements</a></div><div class="ttdeci">void AddContentProtectionElements(const MediaInfo &amp;media_info, Representation *parent)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dfb/mpd__utils_8cc_source.html#l00339">mpd_utils.cc:339</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a640f5455a6d64063c364b81a8a6e878a"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">shaka::SimpleMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00085">simple_mpd_notifier.cc:85</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a8ea622a21a5807775bb2d998fa04658f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">shaka::SimpleMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00128">simple_mpd_notifier.cc:128</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a640f5455a6d64063c364b81a8a6e878a"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a640f5455a6d64063c364b81a8a6e878a">shaka::SimpleMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00086">simple_mpd_notifier.cc:86</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a8ea622a21a5807775bb2d998fa04658f"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a8ea622a21a5807775bb2d998fa04658f">shaka::SimpleMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00129">simple_mpd_notifier.cc:129</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a4c7f8f964fec2bb9543e7ee8da9cd994"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">shaka::Uint8VectorToBase64</a></div><div class="ttdeci">std::string Uint8VectorToBase64(const std::vector&lt; uint8_t &gt; &amp;input)</div><div class="ttdoc">Converts uint8 vector into base64 encoded string. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00068">mpd_notifier_util.cc:68</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ad876de8c9909394b6fb47f387066fc83"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">shaka::SimpleMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00073">simple_mpd_notifier.cc:73</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ae1a1231fb13e0bc97cdea5fc239184bf"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">shaka::SimpleMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00099">simple_mpd_notifier.cc:99</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00646">mpd_builder.cc:646</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ad876de8c9909394b6fb47f387066fc83"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ad876de8c9909394b6fb47f387066fc83">shaka::SimpleMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00074">simple_mpd_notifier.cc:74</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_ae1a1231fb13e0bc97cdea5fc239184bf"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#ae1a1231fb13e0bc97cdea5fc239184bf">shaka::SimpleMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00100">simple_mpd_notifier.cc:100</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00643">mpd_builder.cc:643</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a5ea880937da26d677ff6a48c0219d090"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">shaka::GetContentType</a></div><div class="ttdeci">ContentType GetContentType(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00051">mpd_notifier_util.cc:51</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a7e940cda37fa0dbefef3b3cc9c802ab8"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">shaka::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(const std::string &amp;output_path, MpdBuilder *mpd_builder)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00020">mpd_notifier_util.cc:20</a></div></div>
-<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a3f4aabd86ec08e5ff427120ed39fda29"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">shaka::SimpleMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00038">simple_mpd_notifier.cc:38</a></div></div>
+<div class="ttc" id="classshaka_1_1SimpleMpdNotifier_html_a3f4aabd86ec08e5ff427120ed39fda29"><div class="ttname"><a href="../../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a3f4aabd86ec08e5ff427120ed39fda29">shaka::SimpleMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00039">simple_mpd_notifier.cc:39</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d7e/aac__audio__specific__config_8h_source.html b/docs/d2/d7e/aac__audio__specific__config_8h_source.html
index 618f7ca6d8..4ff561aba7 100644
--- a/docs/d2/d7e/aac__audio__specific__config_8h_source.html
+++ b/docs/d2/d7e/aac__audio__specific__config_8h_source.html
@@ -164,7 +164,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d7f/structshaka_1_1media_1_1mp4_1_1CuePayloadBox.html b/docs/d2/d7f/structshaka_1_1media_1_1mp4_1_1CuePayloadBox.html
index 51ccbd10a9..997442a017 100644
--- a/docs/d2/d7f/structshaka_1_1media_1_1mp4_1_1CuePayloadBox.html
+++ b/docs/d2/d7f/structshaka_1_1media_1_1mp4_1_1CuePayloadBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d8a/hls__notify__muxer__listener_8h_source.html b/docs/d2/d8a/hls__notify__muxer__listener_8h_source.html
index 1bbee4e8f8..5d5d8c741d 100644
--- a/docs/d2/d8a/hls__notify__muxer__listener_8h_source.html
+++ b/docs/d2/d8a/hls__notify__muxer__listener_8h_source.html
@@ -175,7 +175,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d91/structshaka_1_1media_1_1mp4_1_1CuePayloadBox-members.html b/docs/d2/d91/structshaka_1_1media_1_1mp4_1_1CuePayloadBox-members.html
index 9da92982ac..a074828da7 100644
--- a/docs/d2/d91/structshaka_1_1media_1_1mp4_1_1CuePayloadBox-members.html
+++ b/docs/d2/d91/structshaka_1_1media_1_1mp4_1_1CuePayloadBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d92/box__reader_8h_source.html b/docs/d2/d92/box__reader_8h_source.html
index 549baa695c..8c16722929 100644
--- a/docs/d2/d92/box__reader_8h_source.html
+++ b/docs/d2/d92/box__reader_8h_source.html
@@ -246,7 +246,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html b/docs/d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html
index eefd2ddc99..a5846cee50 100644
--- a/docs/d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html
+++ b/docs/d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html
@@ -387,7 +387,7 @@ const std::vector&lt; uint8_t &gt; &amp;&#160;</td><td class="memItemRight" vali
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/d95/structshaka_1_1media_1_1StreamDescriptor.html b/docs/d2/d95/structshaka_1_1media_1_1StreamDescriptor.html
index 80b2eb9e20..567c090957 100644
--- a/docs/d2/d95/structshaka_1_1media_1_1StreamDescriptor.html
+++ b/docs/d2/d95/structshaka_1_1media_1_1StreamDescriptor.html
@@ -140,7 +140,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>hls_playlist_n
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/da6/threaded__io__file_8h_source.html b/docs/d2/da6/threaded__io__file_8h_source.html
index aa5f86ecf0..8b90970ec2 100644
--- a/docs/d2/da6/threaded__io__file_8h_source.html
+++ b/docs/d2/da6/threaded__io__file_8h_source.html
@@ -172,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/da8/mp4_2segmenter_8cc_source.html b/docs/d2/da8/mp4_2segmenter_8cc_source.html
index ebcb60e25e..349680f58b 100644
--- a/docs/d2/da8/mp4_2segmenter_8cc_source.html
+++ b/docs/d2/da8/mp4_2segmenter_8cc_source.html
@@ -98,189 +98,189 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;algorithm&gt;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_writer.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_stream.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_options.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_util.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/video_stream_info.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/muxer_listener.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/progress_listener.h&quot;</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/box_definitions.h&quot;</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/key_rotation_fragmenter.h&quot;</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;packager/version/version.h&quot;</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span>mp4 {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kCencKeyIdSize = 16u;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// The version of cenc implemented here. CENC 4.</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kCencSchemeVersion = 0x00010000;</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="comment">// The default KID for key rotation is all 0s.</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keyword">const</span> uint8_t kKeyRotationDefaultKeyId[] = {</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  0, 0, 0, 0, 0, 0, 0, 0,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  0, 0, 0, 0, 0, 0, 0, 0</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;};</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="comment">// Defines protection pattern for pattern-based encryption.</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="keyword">struct </span>ProtectionPattern {</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  uint8_t crypt_byte_block;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  uint8_t skip_byte_block;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;};</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;static_assert(arraysize(kKeyRotationDefaultKeyId) == kCencKeyIdSize,</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;              <span class="stringliteral">&quot;cenc_key_id_must_be_size_16&quot;</span>);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;uint64_t Rescale(uint64_t time_in_old_scale,</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                 uint32_t old_scale,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                 uint32_t new_scale) {</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(time_in_old_scale) / old_scale * new_scale;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;}</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;ProtectionPattern GetProtectionPattern(FourCC protection_scheme,</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                                       TrackType track_type) {</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  ProtectionPattern pattern;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordflow">if</span> (protection_scheme != FOURCC_cbcs &amp;&amp; protection_scheme != FOURCC_cens) {</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="comment">// Not using pattern encryption.</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    pattern.crypt_byte_block = 0u;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    pattern.skip_byte_block = 0u;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (track_type != kVideo) {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="comment">// Tracks other than video are protected using whole-block full-sample</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="comment">// encryption, which is essentially a pattern of 1:0. Note that this may not</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="comment">// be the same as the non-pattern based encryption counterparts, e.g. in</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="comment">// &#39;cens&#39; for full sample encryption, the whole sample is encrypted up to</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="comment">// the last 16-byte boundary, see 23001-7:2016(E) 9.7; while in &#39;cenc&#39; for</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="comment">// full sample encryption, the last partial 16-byte block is also encrypted,</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="comment">// see 23001-7:2016(E) 9.4.2. Another difference is the use of constant iv.</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    pattern.crypt_byte_block = 1u;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    pattern.skip_byte_block = 0u;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="comment">// Use 1:9 pattern for video.</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keyword">const</span> uint8_t kCryptByteBlock = 1u;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keyword">const</span> uint8_t kSkipByteBlock = 9u;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    pattern.crypt_byte_block = kCryptByteBlock;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    pattern.skip_byte_block = kSkipByteBlock;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  }</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordflow">return</span> pattern;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;}</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<span class="keywordtype">void</span> GenerateSinf(<span class="keyword">const</span> EncryptionKey&amp; encryption_key,</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                  FourCC old_type,</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;                  FourCC protection_scheme,</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;                  ProtectionPattern pattern,</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;                  ProtectionSchemeInfo* sinf) {</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  sinf-&gt;format.format = old_type;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  DCHECK_NE(protection_scheme, FOURCC_NULL);</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  sinf-&gt;type.type = protection_scheme;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  sinf-&gt;type.version = kCencSchemeVersion;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keyword">auto</span>&amp; track_encryption = sinf-&gt;info.track_encryption;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  track_encryption.default_is_protected = 1;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  DCHECK(!encryption_key.iv.empty());</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == FOURCC_cbcs) {</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="comment">// ISO/IEC 23001-7:2016 10.4.1</span></div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="comment">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    track_encryption.default_per_sample_iv_size = 0;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    track_encryption.default_constant_iv = encryption_key.iv;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    track_encryption.default_per_sample_iv_size =</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;      <span class="keyword">static_cast&lt;</span>uint8_t<span class="keyword">&gt;</span>(encryption_key.iv.size());</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  }</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  track_encryption.default_crypt_byte_block = pattern.crypt_byte_block;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  track_encryption.default_skip_byte_block = pattern.skip_byte_block;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  track_encryption.default_kid = encryption_key.key_id;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;}</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;<span class="keywordtype">void</span> GenerateEncryptedSampleEntry(<span class="keyword">const</span> EncryptionKey&amp; encryption_key,</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;                                  <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                  FourCC protection_scheme,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                  ProtectionPattern pattern,</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;                                  SampleDescription* description) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  DCHECK(description);</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keywordflow">if</span> (description-&gt;type == kVideo) {</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    DCHECK_EQ(1u, description-&gt;video_entries.size());</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="comment">// Add a second entry for clear content if needed.</span></div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordflow">if</span> (clear_lead_in_seconds &gt; 0)</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;      description-&gt;video_entries.push_back(description-&gt;video_entries[0]);</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    <span class="comment">// Convert the first entry to an encrypted entry.</span></div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;    VideoSampleEntry&amp; entry = description-&gt;video_entries[0];</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;    GenerateSinf(encryption_key, entry.format, protection_scheme, pattern,</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;                 &amp;entry.sinf);</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    entry.format = FOURCC_encv;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    DCHECK_EQ(kAudio, description-&gt;type);</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    DCHECK_EQ(1u, description-&gt;audio_entries.size());</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    <span class="comment">// Add a second entry for clear content if needed.</span></div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">if</span> (clear_lead_in_seconds &gt; 0)</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;      description-&gt;audio_entries.push_back(description-&gt;audio_entries[0]);</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    <span class="comment">// Convert the first entry to an encrypted entry.</span></div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    AudioSampleEntry&amp; entry = description-&gt;audio_entries[0];</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    GenerateSinf(encryption_key, entry.format, protection_scheme, pattern,</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;                 &amp;entry.sinf);</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    entry.format = FOURCC_enca;</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  }</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;}</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;Segmenter::Segmenter(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;                     std::unique_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;                     std::unique_ptr&lt;Movie&gt; moov)</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    : options_(options),</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      ftyp_(std::move(ftyp)),</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;      moov_(std::move(moov)),</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;      moof_(new MovieFragment()),</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;      fragment_buffer_(new BufferWriter()),</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;      sidx_(new SegmentIndex()),</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;      muxer_listener_(NULL),</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;      progress_listener_(NULL),</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      progress_target_(0),</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;      accumulated_progress_(0),</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;      sample_duration_(0u) {}</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;Segmenter::~Segmenter() { STLDeleteElements(&amp;fragmenters_); }</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
-<div class="line"><a name="l00166"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">  166</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Segmenter::Initialize</a>(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;                             <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;                             <a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a>* progress_listener,</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;                             <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* encryption_key_source,</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;                             uint32_t max_sd_pixels,</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;                             <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;                             <span class="keywordtype">double</span> crypto_period_duration_in_seconds,</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;                             FourCC protection_scheme) {</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  DCHECK_LT(0u, streams.size());</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  muxer_listener_ = muxer_listener;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  progress_listener_ = progress_listener;</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  moof_-&gt;header.sequence_number = 0;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  moof_-&gt;tracks.resize(streams.size());</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  segment_durations_.resize(streams.size());</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  fragmenters_.resize(streams.size());</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> key_rotation_enabled = crypto_period_duration_in_seconds != 0;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> kInitialEncryptionInfo = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="keywordflow">for</span> (uint32_t i = 0; i &lt; streams.size(); ++i) {</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    stream_map_[streams[i]] = i;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    moof_-&gt;tracks[i].header.track_id = i + 1;</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;    <span class="keywordflow">if</span> (streams[i]-&gt;info()-&gt;stream_type() == kStreamVideo) {</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;      <span class="comment">// Use the first video stream as the reference stream (which is 1-based).</span></div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;      <span class="keywordflow">if</span> (sidx_-&gt;reference_id == 0)</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;        sidx_-&gt;reference_id = i + 1;</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    }</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_source) {</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;      fragmenters_[i] = <span class="keyword">new</span> <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>(streams[i]-&gt;info(), &amp;moof_-&gt;tracks[i]);</div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_writer.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_stream.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_options.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_util.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/video_stream_info.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/muxer_listener.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/progress_listener.h&quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/box_definitions.h&quot;</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/key_rotation_fragmenter.h&quot;</span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;packager/version/version.h&quot;</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>mp4 {</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kCencKeyIdSize = 16u;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">// The version of cenc implemented here. CENC 4.</span></div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kCencSchemeVersion = 0x00010000;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">// The default KID for key rotation is all 0s.</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">const</span> uint8_t kKeyRotationDefaultKeyId[] = {</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  0, 0, 0, 0, 0, 0, 0, 0,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  0, 0, 0, 0, 0, 0, 0, 0</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;};</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="comment">// Defines protection pattern for pattern-based encryption.</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">struct </span>ProtectionPattern {</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  uint8_t crypt_byte_block;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  uint8_t skip_byte_block;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;};</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;static_assert(arraysize(kKeyRotationDefaultKeyId) == kCencKeyIdSize,</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;              <span class="stringliteral">&quot;cenc_key_id_must_be_size_16&quot;</span>);</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;uint64_t Rescale(uint64_t time_in_old_scale,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                 uint32_t old_scale,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                 uint32_t new_scale) {</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(time_in_old_scale) / old_scale * new_scale;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;}</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;ProtectionPattern GetProtectionPattern(FourCC protection_scheme,</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;                                       TrackType track_type) {</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  ProtectionPattern pattern;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordflow">if</span> (protection_scheme != FOURCC_cbcs &amp;&amp; protection_scheme != FOURCC_cens) {</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="comment">// Not using pattern encryption.</span></div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    pattern.crypt_byte_block = 0u;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    pattern.skip_byte_block = 0u;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (track_type != kVideo) {</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="comment">// Tracks other than video are protected using whole-block full-sample</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="comment">// encryption, which is essentially a pattern of 1:0. Note that this may not</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="comment">// be the same as the non-pattern based encryption counterparts, e.g. in</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="comment">// &#39;cens&#39; for full sample encryption, the whole sample is encrypted up to</span></div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="comment">// the last 16-byte boundary, see 23001-7:2016(E) 9.7; while in &#39;cenc&#39; for</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="comment">// full sample encryption, the last partial 16-byte block is also encrypted,</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="comment">// see 23001-7:2016(E) 9.4.2. Another difference is the use of constant iv.</span></div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    pattern.crypt_byte_block = 1u;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    pattern.skip_byte_block = 0u;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="comment">// Use 1:9 pattern for video.</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="keyword">const</span> uint8_t kCryptByteBlock = 1u;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keyword">const</span> uint8_t kSkipByteBlock = 9u;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    pattern.crypt_byte_block = kCryptByteBlock;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    pattern.skip_byte_block = kSkipByteBlock;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  }</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">return</span> pattern;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;}</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="keywordtype">void</span> GenerateSinf(<span class="keyword">const</span> EncryptionKey&amp; encryption_key,</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                  FourCC old_type,</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                  FourCC protection_scheme,</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;                  ProtectionPattern pattern,</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;                  ProtectionSchemeInfo* sinf) {</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  sinf-&gt;format.format = old_type;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  DCHECK_NE(protection_scheme, FOURCC_NULL);</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  sinf-&gt;type.type = protection_scheme;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  sinf-&gt;type.version = kCencSchemeVersion;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="keyword">auto</span>&amp; track_encryption = sinf-&gt;info.track_encryption;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  track_encryption.default_is_protected = 1;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  DCHECK(!encryption_key.iv.empty());</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == FOURCC_cbcs) {</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="comment">// ISO/IEC 23001-7:2016 10.4.1</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="comment">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    track_encryption.default_per_sample_iv_size = 0;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    track_encryption.default_constant_iv = encryption_key.iv;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    track_encryption.default_per_sample_iv_size =</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;      <span class="keyword">static_cast&lt;</span>uint8_t<span class="keyword">&gt;</span>(encryption_key.iv.size());</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  }</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  track_encryption.default_crypt_byte_block = pattern.crypt_byte_block;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  track_encryption.default_skip_byte_block = pattern.skip_byte_block;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  track_encryption.default_kid = encryption_key.key_id;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;}</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;<span class="keywordtype">void</span> GenerateEncryptedSampleEntry(<span class="keyword">const</span> EncryptionKey&amp; encryption_key,</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;                                  <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;                                  FourCC protection_scheme,</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                  ProtectionPattern pattern,</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                  SampleDescription* description) {</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  DCHECK(description);</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keywordflow">if</span> (description-&gt;type == kVideo) {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    DCHECK_EQ(1u, description-&gt;video_entries.size());</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="comment">// Add a second entry for clear content if needed.</span></div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordflow">if</span> (clear_lead_in_seconds &gt; 0)</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;      description-&gt;video_entries.push_back(description-&gt;video_entries[0]);</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <span class="comment">// Convert the first entry to an encrypted entry.</span></div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    VideoSampleEntry&amp; entry = description-&gt;video_entries[0];</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;    GenerateSinf(encryption_key, entry.format, protection_scheme, pattern,</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;                 &amp;entry.sinf);</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    entry.format = FOURCC_encv;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    DCHECK_EQ(kAudio, description-&gt;type);</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    DCHECK_EQ(1u, description-&gt;audio_entries.size());</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="comment">// Add a second entry for clear content if needed.</span></div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    <span class="keywordflow">if</span> (clear_lead_in_seconds &gt; 0)</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;      description-&gt;audio_entries.push_back(description-&gt;audio_entries[0]);</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;    <span class="comment">// Convert the first entry to an encrypted entry.</span></div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    AudioSampleEntry&amp; entry = description-&gt;audio_entries[0];</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    GenerateSinf(encryption_key, entry.format, protection_scheme, pattern,</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;                 &amp;entry.sinf);</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    entry.format = FOURCC_enca;</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  }</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;}</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;Segmenter::Segmenter(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;                     std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;                     std::unique_ptr&lt;Movie&gt; moov)</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    : options_(options),</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      ftyp_(std::move(ftyp)),</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      moov_(std::move(moov)),</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;      moof_(new MovieFragment()),</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;      fragment_buffer_(new BufferWriter()),</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;      sidx_(new SegmentIndex()),</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;      muxer_listener_(NULL),</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;      progress_listener_(NULL),</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;      progress_target_(0),</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      accumulated_progress_(0),</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;      sample_duration_(0u) {}</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;Segmenter::~Segmenter() {}</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
+<div class="line"><a name="l00165"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">  165</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Segmenter::Initialize</a>(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;                             <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;                             <a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a>* progress_listener,</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;                             <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* encryption_key_source,</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;                             uint32_t max_sd_pixels,</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;                             <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;                             <span class="keywordtype">double</span> crypto_period_duration_in_seconds,</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;                             FourCC protection_scheme) {</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  DCHECK_LT(0u, streams.size());</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  muxer_listener_ = muxer_listener;</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  progress_listener_ = progress_listener;</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  moof_-&gt;header.sequence_number = 0;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  moof_-&gt;tracks.resize(streams.size());</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  segment_durations_.resize(streams.size());</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  fragmenters_.resize(streams.size());</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> key_rotation_enabled = crypto_period_duration_in_seconds != 0;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> kInitialEncryptionInfo = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  <span class="keywordflow">for</span> (uint32_t i = 0; i &lt; streams.size(); ++i) {</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    stream_map_[streams[i]] = i;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    moof_-&gt;tracks[i].header.track_id = i + 1;</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">if</span> (streams[i]-&gt;info()-&gt;stream_type() == kStreamVideo) {</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      <span class="comment">// Use the first video stream as the reference stream (which is 1-based).</span></div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;      <span class="keywordflow">if</span> (sidx_-&gt;reference_id == 0)</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;        sidx_-&gt;reference_id = i + 1;</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    }</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_source) {</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;      fragmenters_[i].reset(</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;          <span class="keyword">new</span> <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>(streams[i]-&gt;info(), &amp;moof_-&gt;tracks[i]));</div>
 <div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;      <span class="keywordflow">continue</span>;</div>
 <div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    }</div>
 <div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;</div>
@@ -309,13 +309,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;            encryption_key.iv, encryption_key.key_system_info);</div>
 <div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;      }</div>
 <div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;      fragmenters_[i] = <span class="keyword">new</span> <a class="code" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html">KeyRotationFragmenter</a>(</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;      fragmenters_[i].reset(<span class="keyword">new</span> <a class="code" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html">KeyRotationFragmenter</a>(</div>
 <div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;          moof_.get(), streams[i]-&gt;info(), &amp;moof_-&gt;tracks[i],</div>
 <div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;          encryption_key_source, track_type,</div>
 <div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;          crypto_period_duration_in_seconds * streams[i]-&gt;info()-&gt;time_scale(),</div>
 <div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;          clear_lead_in_seconds * streams[i]-&gt;info()-&gt;time_scale(),</div>
 <div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;          protection_scheme, pattern.crypt_byte_block, pattern.skip_byte_block,</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;          muxer_listener_);</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;          muxer_listener_));</div>
 <div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;      <span class="keywordflow">continue</span>;</div>
 <div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    }</div>
 <div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
@@ -347,11 +347,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;      }</div>
 <div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    }</div>
 <div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    fragmenters_[i] = <span class="keyword">new</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">EncryptingFragmenter</a>(</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    fragmenters_[i].reset(<span class="keyword">new</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">EncryptingFragmenter</a>(</div>
 <div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;        streams[i]-&gt;info(), &amp;moof_-&gt;tracks[i], std::move(encryption_key),</div>
 <div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;        clear_lead_in_seconds * streams[i]-&gt;info()-&gt;time_scale(),</div>
 <div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;        protection_scheme, pattern.crypt_byte_block, pattern.skip_byte_block,</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;        muxer_listener_);</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;        muxer_listener_));</div>
 <div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;  }</div>
 <div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;</div>
 <div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;  <span class="keywordflow">if</span> (options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a4d3d8c1923a2e0f684c2591cd7f4a890">mp4_use_decoding_timestamp_in_timeline</a>) {</div>
@@ -383,197 +383,193 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;}</div>
 <div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;</div>
 <div class="line"><a name="l00296"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">  296</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Segmenter::Finalize</a>() {</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;Fragmenter*&gt;::iterator it = fragmenters_.begin();</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;       it != fragmenters_.end();</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;       ++it) {</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = FinalizeFragment(<span class="keyword">true</span>, *it);</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  }</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="comment">// Set tracks and moov durations.</span></div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  <span class="comment">// Note that the updated moov box will be written to output file for VOD case</span></div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;  <span class="comment">// only.</span></div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;Track&gt;::iterator track = moov_-&gt;tracks.begin();</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;       track != moov_-&gt;tracks.end();</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;       ++track) {</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    track-&gt;header.duration = Rescale(track-&gt;media.header.duration,</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;                                     track-&gt;media.header.timescale,</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;                                     moov_-&gt;header.timescale);</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;    <span class="keywordflow">if</span> (track-&gt;header.duration &gt; moov_-&gt;header.duration)</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;      moov_-&gt;header.duration = track-&gt;header.duration;</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  }</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;  moov_-&gt;extends.header.fragment_duration = moov_-&gt;header.duration;</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  <span class="keywordflow">return</span> DoFinalize();</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;}</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;</div>
-<div class="line"><a name="l00322"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">  322</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">Segmenter::AddSample</a>(<span class="keyword">const</span> <a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>* stream,</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;                            scoped_refptr&lt;MediaSample&gt; sample) {</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  <span class="comment">// Find the fragmenter for this stream.</span></div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  DCHECK(stream);</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  DCHECK(stream_map_.find(stream) != stream_map_.end());</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  uint32_t stream_id = stream_map_[stream];</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>* fragmenter = fragmenters_[stream_id];</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  <span class="comment">// Set default sample duration if it has not been set yet.</span></div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;  <span class="keywordflow">if</span> (moov_-&gt;extends.tracks[stream_id].default_sample_duration == 0) {</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;    moov_-&gt;extends.tracks[stream_id].default_sample_duration =</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;        sample-&gt;duration();</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  }</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  <span class="keywordflow">if</span> (fragmenter-&gt;fragment_finalized()) {</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FRAGMENT_FINALIZED,</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;                  <span class="stringliteral">&quot;Current fragment is finalized already.&quot;</span>);</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;  }</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  <span class="keywordtype">bool</span> finalize_fragment = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;  <span class="keywordflow">if</span> (fragmenter-&gt;fragment_duration() &gt;=</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;      options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a0dbe637b21f1f22f248437b59ad62a38">fragment_duration</a> * stream-&gt;info()-&gt;time_scale()) {</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    <span class="keywordflow">if</span> (sample-&gt;is_key_frame() || !options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#acb335182d4bd226c1f044cc83705f4fc">fragment_sap_aligned</a>) {</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;      finalize_fragment = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    }</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  }</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  <span class="keywordtype">bool</span> finalize_segment = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  <span class="keywordflow">if</span> (segment_durations_[stream_id] &gt;=</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;      options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a4e98ad5fc7bbc2df0cb95df3f1db9687">segment_duration</a> * stream-&gt;info()-&gt;time_scale()) {</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;    <span class="keywordflow">if</span> (sample-&gt;is_key_frame() || !options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a1f1336e9be8b12733fe28da083eaf93f">segment_sap_aligned</a>) {</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;      finalize_segment = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;      finalize_fragment = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;    }</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  }</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;  <span class="keywordflow">if</span> (finalize_fragment) {</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    status = FinalizeFragment(finalize_segment, fragmenter);</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  }</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;  status = fragmenter-&gt;<a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">AddSample</a>(sample);</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;    <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;  <span class="keywordflow">if</span> (sample_duration_ == 0)</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;    sample_duration_ = sample-&gt;duration();</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;  moov_-&gt;tracks[stream_id].media.header.duration += sample-&gt;duration();</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;  segment_durations_[stream_id] += sample-&gt;duration();</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;  DCHECK_GE(segment_durations_[stream_id], fragmenter-&gt;fragment_duration());</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;}</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;uint32_t Segmenter::GetReferenceTimeScale()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;  <span class="keywordflow">return</span> moov_-&gt;header.timescale;</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;}</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;</div>
-<div class="line"><a name="l00380"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">  380</a></span>&#160;<span class="keywordtype">double</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a277aeb59ed41fc484a86101d565017ae">Segmenter::GetDuration</a>()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;  <span class="keywordflow">if</span> (moov_-&gt;header.timescale == 0) {</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;    <span class="comment">// Handling the case where this is not properly initialized.</span></div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    <span class="keywordflow">return</span> 0.0;</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;  }</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(moov_-&gt;header.duration) / moov_-&gt;header.timescale;</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;}</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;</div>
-<div class="line"><a name="l00389"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">  389</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a32dc8b7461252b99fe52384b04e3bca2">Segmenter::UpdateProgress</a>(uint64_t progress) {</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;  accumulated_progress_ += progress;</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="keywordflow">if</span> (!progress_listener_) <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  <span class="keywordflow">if</span> (progress_target_ == 0) <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;  <span class="comment">// It might happen that accumulated progress exceeds progress_target due to</span></div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="comment">// computation errors, e.g. rounding error. Cap it so it never reports &gt; 100%</span></div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="comment">// progress.</span></div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  <span class="keywordflow">if</span> (accumulated_progress_ &gt;= progress_target_) {</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;    progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(1.0);</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;    progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(static_cast&lt;double&gt;(accumulated_progress_) /</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;                                   progress_target_);</div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  }</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;}</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;</div>
-<div class="line"><a name="l00405"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">  405</a></span>&#160;<span class="keywordtype">void</span> Segmenter::SetComplete() {</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  <span class="keywordflow">if</span> (!progress_listener_) <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;  progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(1.0);</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;}</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> Segmenter::FinalizeSegment() {</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = DoFinalizeSegment();</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  <span class="comment">// Reset segment information to initial state.</span></div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  sidx_-&gt;references.clear();</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  std::vector&lt;uint64_t&gt;::iterator it = segment_durations_.begin();</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  <span class="keywordflow">for</span> (; it != segment_durations_.end(); ++it)</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;    *it = 0;</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;}</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;uint32_t Segmenter::GetReferenceStreamId() {</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;  DCHECK(sidx_);</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  <span class="keywordflow">return</span> sidx_-&gt;reference_id - 1;</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;}</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;Status Segmenter::FinalizeFragment(<span class="keywordtype">bool</span> finalize_segment,</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;                                   Fragmenter* fragmenter) {</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  fragmenter-&gt;FinalizeFragment();</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;  <span class="comment">// Check if all tracks are ready for fragmentation.</span></div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;Fragmenter*&gt;::iterator it = fragmenters_.begin();</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;       it != fragmenters_.end();</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;       ++it) {</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;    <span class="keywordflow">if</span> (!(*it)-&gt;fragment_finalized())</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;      <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  }</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  MediaData mdat;</div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  <span class="comment">// Data offset relative to &#39;moof&#39;: moof size + mdat header size.</span></div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  <span class="comment">// The code will also update box sizes for moof_ and its child boxes.</span></div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  uint64_t data_offset = moof_-&gt;ComputeSize() + mdat.HeaderSize();</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;  <span class="comment">// &#39;traf&#39; should follow &#39;mfhd&#39; moof header box.</span></div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;  uint64_t next_traf_position = moof_-&gt;HeaderSize() + moof_-&gt;header.box_size();</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; moof_-&gt;tracks.size(); ++i) {</div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;    TrackFragment&amp; traf = moof_-&gt;tracks[i];</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;    <span class="keywordflow">if</span> (traf.auxiliary_offset.offsets.size() &gt; 0) {</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;      DCHECK_EQ(traf.auxiliary_offset.offsets.size(), 1u);</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;      DCHECK(!traf.sample_encryption.sample_encryption_entries.empty());</div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;      next_traf_position += traf.box_size();</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;      <span class="comment">// SampleEncryption &#39;senc&#39; box should be the last box in &#39;traf&#39;.</span></div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;      <span class="comment">// |auxiliary_offset| should point to the data of SampleEncryption.</span></div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;      traf.auxiliary_offset.offsets[0] =</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;          next_traf_position - traf.sample_encryption.box_size() +</div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;          traf.sample_encryption.HeaderSize() +</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;          <span class="keyword">sizeof</span>(uint32_t);  <span class="comment">// for sample count field in &#39;senc&#39;</span></div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;    }</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;    traf.runs[0].data_offset = data_offset + mdat.data_size;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;    mdat.data_size += fragmenters_[i]-&gt;data()-&gt;Size();</div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  }</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  <span class="comment">// Generate segment reference.</span></div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;  sidx_-&gt;references.resize(sidx_-&gt;references.size() + 1);</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  fragmenters_[GetReferenceStreamId()]-&gt;GenerateSegmentReference(</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;      &amp;sidx_-&gt;references[sidx_-&gt;references.size() - 1]);</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  sidx_-&gt;references[sidx_-&gt;references.size() - 1].referenced_size =</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;      data_offset + mdat.data_size;</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;  <span class="comment">// Write the fragment to buffer.</span></div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  moof_-&gt;Write(fragment_buffer_.get());</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  mdat.WriteHeader(fragment_buffer_.get());</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  <span class="keywordflow">for</span> (Fragmenter* fragmenter : fragmenters_)</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;    fragment_buffer_-&gt;AppendBuffer(*fragmenter-&gt;data());</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;  <span class="comment">// Increase sequence_number for next fragment.</span></div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  ++moof_-&gt;header.sequence_number;</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  <span class="keywordflow">if</span> (finalize_segment)</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;    <span class="keywordflow">return</span> FinalizeSegment();</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;}</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;}  <span class="comment">// namespace mp4</span></div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;Fragmenter&gt;&amp; fragmenter : fragmenters_) {</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = FinalizeFragment(<span class="keyword">true</span>, fragmenter.get());</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;      <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  }</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  <span class="comment">// Set tracks and moov durations.</span></div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;  <span class="comment">// Note that the updated moov box will be written to output file for VOD case</span></div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="comment">// only.</span></div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;Track&gt;::iterator track = moov_-&gt;tracks.begin();</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;       track != moov_-&gt;tracks.end();</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;       ++track) {</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    track-&gt;header.duration = Rescale(track-&gt;media.header.duration,</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;                                     track-&gt;media.header.timescale,</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;                                     moov_-&gt;header.timescale);</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    <span class="keywordflow">if</span> (track-&gt;header.duration &gt; moov_-&gt;header.duration)</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;      moov_-&gt;header.duration = track-&gt;header.duration;</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  }</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  moov_-&gt;extends.header.fragment_duration = moov_-&gt;header.duration;</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;  <span class="keywordflow">return</span> DoFinalize();</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;}</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;</div>
+<div class="line"><a name="l00320"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">  320</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">Segmenter::AddSample</a>(<span class="keyword">const</span> <a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>* stream,</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                            scoped_refptr&lt;MediaSample&gt; sample) {</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  <span class="comment">// Find the fragmenter for this stream.</span></div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  DCHECK(stream);</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  DCHECK(stream_map_.find(stream) != stream_map_.end());</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  uint32_t stream_id = stream_map_[stream];</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>* fragmenter = fragmenters_[stream_id].get();</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <span class="comment">// Set default sample duration if it has not been set yet.</span></div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  <span class="keywordflow">if</span> (moov_-&gt;extends.tracks[stream_id].default_sample_duration == 0) {</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;    moov_-&gt;extends.tracks[stream_id].default_sample_duration =</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;        sample-&gt;duration();</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;  }</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  <span class="keywordflow">if</span> (fragmenter-&gt;fragment_finalized()) {</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FRAGMENT_FINALIZED,</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;                  <span class="stringliteral">&quot;Current fragment is finalized already.&quot;</span>);</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;  }</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;  <span class="keywordtype">bool</span> finalize_fragment = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  <span class="keywordflow">if</span> (fragmenter-&gt;fragment_duration() &gt;=</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;      options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a0dbe637b21f1f22f248437b59ad62a38">fragment_duration</a> * stream-&gt;info()-&gt;time_scale()) {</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;    <span class="keywordflow">if</span> (sample-&gt;is_key_frame() || !options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#acb335182d4bd226c1f044cc83705f4fc">fragment_sap_aligned</a>) {</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;      finalize_fragment = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    }</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  }</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keywordtype">bool</span> finalize_segment = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  <span class="keywordflow">if</span> (segment_durations_[stream_id] &gt;=</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;      options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a4e98ad5fc7bbc2df0cb95df3f1db9687">segment_duration</a> * stream-&gt;info()-&gt;time_scale()) {</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;    <span class="keywordflow">if</span> (sample-&gt;is_key_frame() || !options_.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a1f1336e9be8b12733fe28da083eaf93f">segment_sap_aligned</a>) {</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;      finalize_segment = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;      finalize_fragment = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    }</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;  }</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="keywordflow">if</span> (finalize_fragment) {</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    status = FinalizeFragment(finalize_segment, fragmenter);</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;      <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  }</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  status = fragmenter-&gt;<a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">AddSample</a>(sample);</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;    <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  <span class="keywordflow">if</span> (sample_duration_ == 0)</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;    sample_duration_ = sample-&gt;duration();</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;  moov_-&gt;tracks[stream_id].media.header.duration += sample-&gt;duration();</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;  segment_durations_[stream_id] += sample-&gt;duration();</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;  DCHECK_GE(segment_durations_[stream_id], fragmenter-&gt;fragment_duration());</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;}</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;uint32_t Segmenter::GetReferenceTimeScale()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  <span class="keywordflow">return</span> moov_-&gt;header.timescale;</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;}</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;</div>
+<div class="line"><a name="l00378"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">  378</a></span>&#160;<span class="keywordtype">double</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a277aeb59ed41fc484a86101d565017ae">Segmenter::GetDuration</a>()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;  <span class="keywordflow">if</span> (moov_-&gt;header.timescale == 0) {</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;    <span class="comment">// Handling the case where this is not properly initialized.</span></div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;    <span class="keywordflow">return</span> 0.0;</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;  }</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(moov_-&gt;header.duration) / moov_-&gt;header.timescale;</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;}</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;</div>
+<div class="line"><a name="l00387"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">  387</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a32dc8b7461252b99fe52384b04e3bca2">Segmenter::UpdateProgress</a>(uint64_t progress) {</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;  accumulated_progress_ += progress;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;</div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;  <span class="keywordflow">if</span> (!progress_listener_) <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  <span class="keywordflow">if</span> (progress_target_ == 0) <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="comment">// It might happen that accumulated progress exceeds progress_target due to</span></div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  <span class="comment">// computation errors, e.g. rounding error. Cap it so it never reports &gt; 100%</span></div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;  <span class="comment">// progress.</span></div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="keywordflow">if</span> (accumulated_progress_ &gt;= progress_target_) {</div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;    progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(1.0);</div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;    progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(static_cast&lt;double&gt;(accumulated_progress_) /</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;                                   progress_target_);</div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  }</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;}</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;</div>
+<div class="line"><a name="l00403"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">  403</a></span>&#160;<span class="keywordtype">void</span> Segmenter::SetComplete() {</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  <span class="keywordflow">if</span> (!progress_listener_) <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  progress_listener_-&gt;<a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">OnProgress</a>(1.0);</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;}</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> Segmenter::FinalizeSegment() {</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = DoFinalizeSegment();</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  <span class="comment">// Reset segment information to initial state.</span></div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  sidx_-&gt;references.clear();</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  std::vector&lt;uint64_t&gt;::iterator it = segment_durations_.begin();</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  <span class="keywordflow">for</span> (; it != segment_durations_.end(); ++it)</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;    *it = 0;</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;}</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;uint32_t Segmenter::GetReferenceStreamId() {</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  DCHECK(sidx_);</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  <span class="keywordflow">return</span> sidx_-&gt;reference_id - 1;</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;}</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;Status Segmenter::FinalizeFragment(<span class="keywordtype">bool</span> finalize_segment,</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;                                   Fragmenter* fragmenter) {</div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;  fragmenter-&gt;FinalizeFragment();</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  <span class="comment">// Check if all tracks are ready for fragmentation.</span></div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;Fragmenter&gt;&amp; fragmenter : fragmenters_) {</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;    <span class="keywordflow">if</span> (!fragmenter-&gt;fragment_finalized())</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;      <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  }</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;  MediaData mdat;</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  <span class="comment">// Data offset relative to &#39;moof&#39;: moof size + mdat header size.</span></div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  <span class="comment">// The code will also update box sizes for moof_ and its child boxes.</span></div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  uint64_t data_offset = moof_-&gt;ComputeSize() + mdat.HeaderSize();</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  <span class="comment">// &#39;traf&#39; should follow &#39;mfhd&#39; moof header box.</span></div>
+<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  uint64_t next_traf_position = moof_-&gt;HeaderSize() + moof_-&gt;header.box_size();</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; moof_-&gt;tracks.size(); ++i) {</div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;    TrackFragment&amp; traf = moof_-&gt;tracks[i];</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;    <span class="keywordflow">if</span> (traf.auxiliary_offset.offsets.size() &gt; 0) {</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;      DCHECK_EQ(traf.auxiliary_offset.offsets.size(), 1u);</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;      DCHECK(!traf.sample_encryption.sample_encryption_entries.empty());</div>
+<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;      next_traf_position += traf.box_size();</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;      <span class="comment">// SampleEncryption &#39;senc&#39; box should be the last box in &#39;traf&#39;.</span></div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;      <span class="comment">// |auxiliary_offset| should point to the data of SampleEncryption.</span></div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;      traf.auxiliary_offset.offsets[0] =</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;          next_traf_position - traf.sample_encryption.box_size() +</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;          traf.sample_encryption.HeaderSize() +</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;          <span class="keyword">sizeof</span>(uint32_t);  <span class="comment">// for sample count field in &#39;senc&#39;</span></div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;    }</div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;    traf.runs[0].data_offset = data_offset + mdat.data_size;</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;    mdat.data_size += fragmenters_[i]-&gt;data()-&gt;Size();</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;  }</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;</div>
+<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;  <span class="comment">// Generate segment reference.</span></div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  sidx_-&gt;references.resize(sidx_-&gt;references.size() + 1);</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  fragmenters_[GetReferenceStreamId()]-&gt;GenerateSegmentReference(</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;      &amp;sidx_-&gt;references[sidx_-&gt;references.size() - 1]);</div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  sidx_-&gt;references[sidx_-&gt;references.size() - 1].referenced_size =</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;      data_offset + mdat.data_size;</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;  <span class="comment">// Write the fragment to buffer.</span></div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  moof_-&gt;Write(fragment_buffer_.get());</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;  mdat.WriteHeader(fragment_buffer_.get());</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;Fragmenter&gt;&amp; fragmenter : fragmenters_)</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;    fragment_buffer_-&gt;AppendBuffer(*fragmenter-&gt;data());</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  <span class="comment">// Increase sequence_number for next fragment.</span></div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  ++moof_-&gt;header.sequence_number;</div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  <span class="keywordflow">if</span> (finalize_segment)</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;    <span class="keywordflow">return</span> FinalizeSegment();</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;}</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;}  <span class="comment">// namespace mp4</span></div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_acb335182d4bd226c1f044cc83705f4fc"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#acb335182d4bd226c1f044cc83705f4fc">shaka::media::MuxerOptions::fragment_sap_aligned</a></div><div class="ttdeci">bool fragment_sap_aligned</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00043">muxer_options.h:43</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_a277aeb59ed41fc484a86101d565017ae"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a277aeb59ed41fc484a86101d565017ae">shaka::media::webm::Segmenter::GetDuration</a></div><div class="ttdeci">float GetDuration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00194">segmenter.cc:194</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_aa15ccabe1a33c660201ef1d8386067e5"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">shaka::media::webm::Segmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00120">segmenter.cc:120</a></div></div>
@@ -585,7 +581,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1SampleDescription_html"><div class="ttname"><a href="../../da/df5/structshaka_1_1media_1_1mp4_1_1SampleDescription.html">shaka::media::mp4::SampleDescription</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00392">box_definitions.h:392</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Fragmenter_html"><div class="ttname"><a href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/dd1/fragmenter_8h_source.html#l00031">fragmenter.h:31</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_aa6b32c805c4e662d97244531723ce9eb"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">shaka::media::webm::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(std::unique_ptr&lt; MkvWriter &gt; writer, StreamInfo *info, ProgressListener *progress_listener, MuxerListener *muxer_listener, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00051">segmenter.cc:51</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></div><div class="ttdoc">EncryptingFragmenter generates MP4 fragments with sample encrypted. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/dcb/encrypting__fragmenter_8h_source.html#l00028">encrypting_fragmenter.h:28</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a0dbe637b21f1f22f248437b59ad62a38"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a0dbe637b21f1f22f248437b59ad62a38">shaka::media::MuxerOptions::fragment_duration</a></div><div class="ttdeci">double fragment_duration</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00034">muxer_options.h:34</a></div></div>
@@ -601,7 +597,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/da9/classshaka_1_1media_1_1BufferWriter-members.html b/docs/d2/da9/classshaka_1_1media_1_1BufferWriter-members.html
index 920975278f..ae619e0459 100644
--- a/docs/d2/da9/classshaka_1_1media_1_1BufferWriter-members.html
+++ b/docs/d2/da9/classshaka_1_1media_1_1BufferWriter-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dae/classshaka_1_1MockAdaptationSet-members.html b/docs/d2/dae/classshaka_1_1MockAdaptationSet-members.html
index 32ebf655aa..02a8fcd0b4 100644
--- a/docs/d2/dae/classshaka_1_1MockAdaptationSet-members.html
+++ b/docs/d2/dae/classshaka_1_1MockAdaptationSet-members.html
@@ -126,7 +126,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dae/webm__muxer_8cc_source.html b/docs/d2/dae/webm__muxer_8cc_source.html
index 8a2fce6bbc..e857be1a5b 100644
--- a/docs/d2/dae/webm__muxer_8cc_source.html
+++ b/docs/d2/dae/webm__muxer_8cc_source.html
@@ -225,7 +225,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/db1/structshaka_1_1media_1_1mp4_1_1SampleToGroup-members.html b/docs/d2/db1/structshaka_1_1media_1_1mp4_1_1SampleToGroup-members.html
index ccecb9c37f..3c2006e55a 100644
--- a/docs/d2/db1/structshaka_1_1media_1_1mp4_1_1SampleToGroup-members.html
+++ b/docs/d2/db1/structshaka_1_1media_1_1mp4_1_1SampleToGroup-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/db6/structshaka_1_1media_1_1mp4_1_1FileType-members.html b/docs/d2/db6/structshaka_1_1media_1_1mp4_1_1FileType-members.html
index 500c2e8f2d..4954d214e4 100644
--- a/docs/d2/db6/structshaka_1_1media_1_1mp4_1_1FileType-members.html
+++ b/docs/d2/db6/structshaka_1_1media_1_1mp4_1_1FileType-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/db8/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox-members.html b/docs/d2/db8/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox-members.html
index 415c1d1b0e..fade7e3507 100644
--- a/docs/d2/db8/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox-members.html
+++ b/docs/d2/db8/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html b/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html
index 58d45c62e7..0423454be8 100644
--- a/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html
+++ b/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html
@@ -180,7 +180,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>single_segment_</b></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dc3/structshaka_1_1media_1_1mp4_1_1Track-members.html b/docs/d2/dc3/structshaka_1_1media_1_1mp4_1_1Track-members.html
index c4303b682b..9d62f17eb6 100644
--- a/docs/d2/dc3/structshaka_1_1media_1_1mp4_1_1Track-members.html
+++ b/docs/d2/dc3/structshaka_1_1media_1_1mp4_1_1Track-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dc7/structshaka_1_1MpdOptions-members.html b/docs/d2/dc7/structshaka_1_1MpdOptions-members.html
index d98364c3ea..891a2f3083 100644
--- a/docs/d2/dc7/structshaka_1_1MpdOptions-members.html
+++ b/docs/d2/dc7/structshaka_1_1MpdOptions-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dcd/program__map__table__writer_8h_source.html b/docs/d2/dcd/program__map__table__writer_8h_source.html
index 851558ebc4..64a61564cd 100644
--- a/docs/d2/dcd/program__map__table__writer_8h_source.html
+++ b/docs/d2/dcd/program__map__table__writer_8h_source.html
@@ -190,7 +190,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dcd/structshaka_1_1media_1_1mp4_1_1EditList-members.html b/docs/d2/dcd/structshaka_1_1media_1_1mp4_1_1EditList-members.html
index ba85a14581..1abdf4ad28 100644
--- a/docs/d2/dcd/structshaka_1_1media_1_1mp4_1_1EditList-members.html
+++ b/docs/d2/dcd/structshaka_1_1media_1_1mp4_1_1EditList-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html b/docs/d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html
index 4d1b83b11d..445703c094 100644
--- a/docs/d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html
+++ b/docs/d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html
@@ -277,7 +277,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dd6/mkv__writer_8h_source.html b/docs/d2/dd6/mkv__writer_8h_source.html
index f0891c0321..bd878f844c 100644
--- a/docs/d2/dd6/mkv__writer_8h_source.html
+++ b/docs/d2/dd6/mkv__writer_8h_source.html
@@ -152,7 +152,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html b/docs/d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html
index e45a08dd9c..bfae2aedc4 100644
--- a/docs/d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html
+++ b/docs/d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html
@@ -256,7 +256,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/de3/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt.html b/docs/d2/de3/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt.html
index 755bd6eb1c..397a0d49cd 100644
--- a/docs/d2/de3/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt.html
+++ b/docs/d2/de3/classshaka_1_1media_1_1mp2t_1_1TsSectionPmt.html
@@ -155,7 +155,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>Reset</b> () override
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/de6/packager__main_8cc_source.html b/docs/d2/de6/packager__main_8cc_source.html
index 11301517b9..87561fdefc 100644
--- a/docs/d2/de6/packager__main_8cc_source.html
+++ b/docs/d2/de6/packager__main_8cc_source.html
@@ -110,574 +110,565 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/base/files/file_path.h&quot;</span></div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;packager/base/path_service.h&quot;</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_split.h&quot;</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/stringprintf.h&quot;</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;packager/base/threading/simple_thread.h&quot;</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/clock.h&quot;</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;packager/hls/base/hls_notifier.h&quot;</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;packager/hls/base/simple_hls_notifier.h&quot;</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/container_names.h&quot;</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/demuxer.h&quot;</span></div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/fourccs.h&quot;</span></div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_options.h&quot;</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_util.h&quot;</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/hls_notify_muxer_listener.h&quot;</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/mpd_notify_muxer_listener.h&quot;</span></div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/vod_media_info_dump_muxer_listener.h&quot;</span></div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_muxer.h&quot;</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/mp4_muxer.h&quot;</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_muxer.h&quot;</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/dash_iop_mpd_notifier.h&quot;</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_builder.h&quot;</span></div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/simple_mpd_notifier.h&quot;</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="preprocessor">#include &quot;packager/version/version.h&quot;</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor">#if defined(OS_WIN)</span></div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#include &lt;codecvt&gt;</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="preprocessor">#include &lt;functional&gt;</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor">#include &lt;locale&gt;</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor">#endif  // defined(OS_WIN)</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;DEFINE_bool(use_fake_clock_for_muxer,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;            <span class="keyword">false</span>,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;            <span class="stringliteral">&quot;Set to true to use a fake clock for muxer. With this flag set, &quot;</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;            <span class="stringliteral">&quot;creation time and modification time in outputs are set to 0. &quot;</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;            <span class="stringliteral">&quot;Should only be used for testing.&quot;</span>);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;DEFINE_bool(override_version,</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;            <span class="keyword">false</span>,</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;            <span class="stringliteral">&quot;Override packager version in the generated outputs with &quot;</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;            <span class="stringliteral">&quot;--test_version if it is set to true. Should be used for &quot;</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;            <span class="stringliteral">&quot;testing only.&quot;</span>);</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;DEFINE_string(test_version,</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;              <span class="stringliteral">&quot;&quot;</span>,</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;              <span class="stringliteral">&quot;Packager version for testing. Ignored if --override_version is &quot;</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;              <span class="stringliteral">&quot;false. Should be used for testing only.&quot;</span>);</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kUsage[] =</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="stringliteral">&quot;Packager driver program. Usage:\n\n&quot;</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="stringliteral">&quot;%s [flags] &lt;stream_descriptor&gt; ...\n&quot;</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="stringliteral">&quot;stream_descriptor consists of comma separated field_name/value pairs:\n&quot;</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="stringliteral">&quot;field_name=value,[field_name=value,]...\n&quot;</span></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="stringliteral">&quot;Supported field names are as follows:\n&quot;</span></div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="stringliteral">&quot;  - input (in): Required input/source media file path or network stream\n&quot;</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="stringliteral">&quot;    URL.\n&quot;</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    <span class="stringliteral">&quot;  - stream_selector (stream): Required field with value &#39;audio&#39;,\n&quot;</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="stringliteral">&quot;    &#39;video&#39;, or stream number (zero based).\n&quot;</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="stringliteral">&quot;  - output (out): Required output file (single file) or initialization\n&quot;</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="stringliteral">&quot;    file path (multiple file).\n&quot;</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="stringliteral">&quot;  - segment_template (segment): Optional value which specifies the\n&quot;</span></div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="stringliteral">&quot;    naming  pattern for the segment files, and that the stream should be\n&quot;</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="stringliteral">&quot;    split into multiple files. Its presence should be consistent across\n&quot;</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="stringliteral">&quot;    streams.\n&quot;</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="stringliteral">&quot;  - bandwidth (bw): Optional value which contains a user-specified\n&quot;</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="stringliteral">&quot;    content bit rate for the stream, in bits/sec. If specified, this\n&quot;</span></div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="stringliteral">&quot;    value is propagated to the $Bandwidth$ template parameter for\n&quot;</span></div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="stringliteral">&quot;    segment names. If not specified, its value may be estimated.\n&quot;</span></div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="stringliteral">&quot;  - language (lang): Optional value which contains a user-specified\n&quot;</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="stringliteral">&quot;    language tag. If specified, this value overrides any language\n&quot;</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    <span class="stringliteral">&quot;    metadata in the input track.\n&quot;</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="stringliteral">&quot;  - output_format (format): Optional value which specifies the format\n&quot;</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="stringliteral">&quot;    of the output files (MP4 or WebM).  If not specified, it will be\n&quot;</span></div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="stringliteral">&quot;    derived from the file extension of the output file.\n&quot;</span></div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="stringliteral">&quot;  - hls_name: Required for audio when outputting HLS.\n&quot;</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="stringliteral">&quot;    name of the output stream. This is not (necessarily) the same as\n&quot;</span></div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="stringliteral">&quot;    output. This is used as the NAME attribute for EXT-X-MEDIA\n&quot;</span></div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="stringliteral">&quot;  - hls_group_id: Required for audio when outputting HLS.\n&quot;</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="stringliteral">&quot;    The group ID for the output stream. For HLS this is used as the\n&quot;</span></div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="stringliteral">&quot;    GROUP-ID attribute for EXT-X-MEDIA.\n&quot;</span></div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="stringliteral">&quot;  - playlist_name: Required for HLS output.\n&quot;</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="stringliteral">&quot;    Name of the playlist for the stream. Usually ends with &#39;.m3u8&#39;.\n&quot;</span>;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kMediaInfoSuffix[] = <span class="stringliteral">&quot;.media_info&quot;</span>;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;<span class="keyword">enum</span> ExitStatus {</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  kSuccess = 0,</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  kArgumentValidationFailed,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  kPackagingFailed,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  kInternalError,</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;};</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="comment">// TODO(rkuroiwa): Write TTML and WebVTT parser (demuxing) for a better check</span></div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;<span class="comment">// and for supporting live/segmenting (muxing).  With a demuxer and a muxer,</span></div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;<span class="comment">// CreateRemuxJobs() shouldn&#39;t treat text as a special case.</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;std::string DetermineTextFileFormat(<span class="keyword">const</span> std::string&amp; file) {</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  std::string content;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">File::ReadFileToString</a>(file.c_str(), &amp;content)) {</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to open file &quot;</span> &lt;&lt; file</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;               &lt;&lt; <span class="stringliteral">&quot; to determine file format.&quot;</span>;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  }</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  MediaContainerName container_name = DetermineContainer(</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;      reinterpret_cast&lt;const uint8_t*&gt;(content.data()), content.size());</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordflow">if</span> (container_name == CONTAINER_WEBVTT) {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;vtt&quot;</span>;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (container_name == CONTAINER_TTML) {</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;ttml&quot;</span>;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  }</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;}</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;FourCC GetProtectionScheme(<span class="keyword">const</span> std::string&amp; protection_scheme) {</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cenc&quot;</span>) {</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    <span class="keywordflow">return</span> FOURCC_cenc;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cens&quot;</span>) {</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    <span class="keywordflow">return</span> FOURCC_cens;</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cbc1&quot;</span>) {</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keywordflow">return</span> FOURCC_cbc1;</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cbcs&quot;</span>) {</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">return</span> FOURCC_cbcs;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unknown protection scheme: &quot;</span> &lt;&lt; protection_scheme;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    <span class="keywordflow">return</span> FOURCC_NULL;</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  }</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;}</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="comment">// A fake clock that always return time 0 (epoch). Should only be used for</span></div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="comment">// testing.</span></div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;<span class="keyword">class </span>FakeClock : <span class="keyword">public</span> base::Clock {</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  base::Time Now()<span class="keyword"> override </span>{ <span class="keywordflow">return</span> base::Time(); }</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;};</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;<span class="comment">// Demux, Mux(es) and worker thread used to remux a source file/stream.</span></div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;<span class="keyword">class </span>RemuxJob : <span class="keyword">public</span> base::SimpleThread {</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  RemuxJob(std::unique_ptr&lt;Demuxer&gt; demuxer)</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;      : SimpleThread(<span class="stringliteral">&quot;RemuxJob&quot;</span>), demuxer_(std::move(demuxer)) {}</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  ~RemuxJob()<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    STLDeleteElements(&amp;muxers_);</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  }</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordtype">void</span> AddMuxer(std::unique_ptr&lt;Muxer&gt; mux) {</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    muxers_.push_back(mux.release());</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  }</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_split.h&quot;</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/stringprintf.h&quot;</span></div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;packager/base/threading/simple_thread.h&quot;</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/clock.h&quot;</span></div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;packager/hls/base/hls_notifier.h&quot;</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;packager/hls/base/simple_hls_notifier.h&quot;</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/container_names.h&quot;</span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/demuxer.h&quot;</span></div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/fourccs.h&quot;</span></div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_options.h&quot;</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/muxer_util.h&quot;</span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/hls_notify_muxer_listener.h&quot;</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/mpd_notify_muxer_listener.h&quot;</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/vod_media_info_dump_muxer_listener.h&quot;</span></div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_muxer.h&quot;</span></div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/mp4_muxer.h&quot;</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_muxer.h&quot;</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/dash_iop_mpd_notifier.h&quot;</span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_builder.h&quot;</span></div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/simple_mpd_notifier.h&quot;</span></div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor">#include &quot;packager/version/version.h&quot;</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor">#if defined(OS_WIN)</span></div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#include &lt;codecvt&gt;</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor">#include &lt;functional&gt;</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="preprocessor">#include &lt;locale&gt;</span></div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor">#endif  // defined(OS_WIN)</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;DEFINE_bool(use_fake_clock_for_muxer,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;            <span class="keyword">false</span>,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;            <span class="stringliteral">&quot;Set to true to use a fake clock for muxer. With this flag set, &quot;</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;            <span class="stringliteral">&quot;creation time and modification time in outputs are set to 0. &quot;</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;            <span class="stringliteral">&quot;Should only be used for testing.&quot;</span>);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;DEFINE_bool(override_version,</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;            <span class="keyword">false</span>,</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;            <span class="stringliteral">&quot;Override packager version in the generated outputs with &quot;</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;            <span class="stringliteral">&quot;--test_version if it is set to true. Should be used for &quot;</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;            <span class="stringliteral">&quot;testing only.&quot;</span>);</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;DEFINE_string(test_version,</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;              <span class="stringliteral">&quot;&quot;</span>,</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;              <span class="stringliteral">&quot;Packager version for testing. Ignored if --override_version is &quot;</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;              <span class="stringliteral">&quot;false. Should be used for testing only.&quot;</span>);</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kUsage[] =</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="stringliteral">&quot;Packager driver program. Usage:\n\n&quot;</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="stringliteral">&quot;%s [flags] &lt;stream_descriptor&gt; ...\n&quot;</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="stringliteral">&quot;stream_descriptor consists of comma separated field_name/value pairs:\n&quot;</span></div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="stringliteral">&quot;field_name=value,[field_name=value,]...\n&quot;</span></div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="stringliteral">&quot;Supported field names are as follows:\n&quot;</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="stringliteral">&quot;  - input (in): Required input/source media file path or network stream\n&quot;</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="stringliteral">&quot;    URL.\n&quot;</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="stringliteral">&quot;  - stream_selector (stream): Required field with value &#39;audio&#39;,\n&quot;</span></div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    <span class="stringliteral">&quot;    &#39;video&#39;, or stream number (zero based).\n&quot;</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="stringliteral">&quot;  - output (out): Required output file (single file) or initialization\n&quot;</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="stringliteral">&quot;    file path (multiple file).\n&quot;</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="stringliteral">&quot;  - segment_template (segment): Optional value which specifies the\n&quot;</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="stringliteral">&quot;    naming  pattern for the segment files, and that the stream should be\n&quot;</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="stringliteral">&quot;    split into multiple files. Its presence should be consistent across\n&quot;</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="stringliteral">&quot;    streams.\n&quot;</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="stringliteral">&quot;  - bandwidth (bw): Optional value which contains a user-specified\n&quot;</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="stringliteral">&quot;    content bit rate for the stream, in bits/sec. If specified, this\n&quot;</span></div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="stringliteral">&quot;    value is propagated to the $Bandwidth$ template parameter for\n&quot;</span></div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="stringliteral">&quot;    segment names. If not specified, its value may be estimated.\n&quot;</span></div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="stringliteral">&quot;  - language (lang): Optional value which contains a user-specified\n&quot;</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="stringliteral">&quot;    language tag. If specified, this value overrides any language\n&quot;</span></div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="stringliteral">&quot;    metadata in the input track.\n&quot;</span></div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    <span class="stringliteral">&quot;  - output_format (format): Optional value which specifies the format\n&quot;</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="stringliteral">&quot;    of the output files (MP4 or WebM).  If not specified, it will be\n&quot;</span></div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="stringliteral">&quot;    derived from the file extension of the output file.\n&quot;</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="stringliteral">&quot;  - hls_name: Required for audio when outputting HLS.\n&quot;</span></div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="stringliteral">&quot;    name of the output stream. This is not (necessarily) the same as\n&quot;</span></div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="stringliteral">&quot;    output. This is used as the NAME attribute for EXT-X-MEDIA\n&quot;</span></div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="stringliteral">&quot;  - hls_group_id: Required for audio when outputting HLS.\n&quot;</span></div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="stringliteral">&quot;    The group ID for the output stream. For HLS this is used as the\n&quot;</span></div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="stringliteral">&quot;    GROUP-ID attribute for EXT-X-MEDIA.\n&quot;</span></div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="stringliteral">&quot;  - playlist_name: Required for HLS output.\n&quot;</span></div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="stringliteral">&quot;    Name of the playlist for the stream. Usually ends with &#39;.m3u8&#39;.\n&quot;</span>;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kMediaInfoSuffix[] = <span class="stringliteral">&quot;.media_info&quot;</span>;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;<span class="keyword">enum</span> ExitStatus {</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  kSuccess = 0,</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  kArgumentValidationFailed,</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  kPackagingFailed,</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  kInternalError,</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;};</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;<span class="comment">// TODO(rkuroiwa): Write TTML and WebVTT parser (demuxing) for a better check</span></div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="comment">// and for supporting live/segmenting (muxing).  With a demuxer and a muxer,</span></div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;<span class="comment">// CreateRemuxJobs() shouldn&#39;t treat text as a special case.</span></div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;std::string DetermineTextFileFormat(<span class="keyword">const</span> std::string&amp; file) {</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  std::string content;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">File::ReadFileToString</a>(file.c_str(), &amp;content)) {</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to open file &quot;</span> &lt;&lt; file</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;               &lt;&lt; <span class="stringliteral">&quot; to determine file format.&quot;</span>;</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  }</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  MediaContainerName container_name = DetermineContainer(</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;      reinterpret_cast&lt;const uint8_t*&gt;(content.data()), content.size());</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordflow">if</span> (container_name == CONTAINER_WEBVTT) {</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;vtt&quot;</span>;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (container_name == CONTAINER_TTML) {</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;ttml&quot;</span>;</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  }</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;}</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;FourCC GetProtectionScheme(<span class="keyword">const</span> std::string&amp; protection_scheme) {</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cenc&quot;</span>) {</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    <span class="keywordflow">return</span> FOURCC_cenc;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cens&quot;</span>) {</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    <span class="keywordflow">return</span> FOURCC_cens;</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cbc1&quot;</span>) {</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    <span class="keywordflow">return</span> FOURCC_cbc1;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (protection_scheme == <span class="stringliteral">&quot;cbcs&quot;</span>) {</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    <span class="keywordflow">return</span> FOURCC_cbcs;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unknown protection scheme: &quot;</span> &lt;&lt; protection_scheme;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    <span class="keywordflow">return</span> FOURCC_NULL;</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  }</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;}</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="comment">// A fake clock that always return time 0 (epoch). Should only be used for</span></div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="comment">// testing.</span></div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="keyword">class </span>FakeClock : <span class="keyword">public</span> base::Clock {</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  base::Time Now()<span class="keyword"> override </span>{ <span class="keywordflow">return</span> base::Time(); }</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;};</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;<span class="comment">// Demux, Mux(es) and worker thread used to remux a source file/stream.</span></div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;<span class="keyword">class </span>RemuxJob : <span class="keyword">public</span> base::SimpleThread {</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  RemuxJob(std::unique_ptr&lt;Demuxer&gt; demuxer)</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;      : SimpleThread(<span class="stringliteral">&quot;RemuxJob&quot;</span>), demuxer_(std::move(demuxer)) {}</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  ~RemuxJob()<span class="keyword"> override </span>{}</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="keywordtype">void</span> AddMuxer(std::unique_ptr&lt;Muxer&gt; mux) {</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    muxers_.push_back(std::move(mux));</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  }</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  Demuxer* demuxer() { <span class="keywordflow">return</span> demuxer_.get(); }</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  Status status() { <span class="keywordflow">return</span> status_; }</div>
 <div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  Demuxer* demuxer() { <span class="keywordflow">return</span> demuxer_.get(); }</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  Status status() { <span class="keywordflow">return</span> status_; }</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordtype">void</span> Run()<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    DCHECK(demuxer_);</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    status_ = demuxer_-&gt;Run();</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  }</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  std::unique_ptr&lt;Demuxer&gt; demuxer_;</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  std::vector&lt;Muxer*&gt; muxers_;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  Status status_;</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordtype">void</span> Run()<span class="keyword"> override </span>{</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    DCHECK(demuxer_);</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    status_ = demuxer_-&gt;Run();</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  }</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  std::unique_ptr&lt;Demuxer&gt; demuxer_;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  std::vector&lt;std::unique_ptr&lt;Muxer&gt;&gt; muxers_;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  Status status_;</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  DISALLOW_COPY_AND_ASSIGN(RemuxJob);</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;};</div>
 <div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  DISALLOW_COPY_AND_ASSIGN(RemuxJob);</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;};</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;<span class="keywordtype">bool</span> StreamInfoToTextMediaInfo(<span class="keyword">const</span> StreamDescriptor&amp; stream_descriptor,</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;                               <span class="keyword">const</span> MuxerOptions&amp; stream_muxer_options,</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;                               MediaInfo* text_media_info) {</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keyword">const</span> std::string&amp; language = stream_descriptor.language;</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  std::string format = DetermineTextFileFormat(stream_descriptor.input);</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  <span class="keywordflow">if</span> (format.empty()) {</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine the text file format for &quot;</span></div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;               &lt;&lt; stream_descriptor.input;</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  }</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">File::Copy</a>(stream_descriptor.input.c_str(),</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;                  stream_muxer_options.output_file_name.c_str())) {</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to copy the input file (&quot;</span> &lt;&lt; stream_descriptor.input</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;               &lt;&lt; <span class="stringliteral">&quot;) to output file (&quot;</span> &lt;&lt; stream_muxer_options.output_file_name</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;               &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  }</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;<span class="keywordtype">bool</span> StreamInfoToTextMediaInfo(<span class="keyword">const</span> StreamDescriptor&amp; stream_descriptor,</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;                               <span class="keyword">const</span> MuxerOptions&amp; stream_muxer_options,</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;                               MediaInfo* text_media_info) {</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keyword">const</span> std::string&amp; language = stream_descriptor.language;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  std::string format = DetermineTextFileFormat(stream_descriptor.input);</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="keywordflow">if</span> (format.empty()) {</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine the text file format for &quot;</span></div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;               &lt;&lt; stream_descriptor.input;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  }</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">File::Copy</a>(stream_descriptor.input.c_str(),</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;                  stream_muxer_options.output_file_name.c_str())) {</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to copy the input file (&quot;</span> &lt;&lt; stream_descriptor.input</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;               &lt;&lt; <span class="stringliteral">&quot;) to output file (&quot;</span> &lt;&lt; stream_muxer_options.output_file_name</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;               &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  }</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  text_media_info-&gt;set_media_file_name(stream_muxer_options.output_file_name);</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  text_media_info-&gt;set_container_type(MediaInfo::CONTAINER_TEXT);</div>
 <div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  text_media_info-&gt;set_media_file_name(stream_muxer_options.output_file_name);</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  text_media_info-&gt;set_container_type(MediaInfo::CONTAINER_TEXT);</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="keywordflow">if</span> (stream_muxer_options.bandwidth != 0) {</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    text_media_info-&gt;set_bandwidth(stream_muxer_options.bandwidth);</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    <span class="comment">// Text files are usually small and since the input is one file; there&#39;s no</span></div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    <span class="comment">// way for the player to do ranged requests. So set this value to something</span></div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="comment">// reasonable.</span></div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    text_media_info-&gt;set_bandwidth(256);</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  }</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  MediaInfo::TextInfo* text_info = text_media_info-&gt;mutable_text_info();</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  text_info-&gt;set_format(format);</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  <span class="keywordflow">if</span> (!language.empty())</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    text_info-&gt;set_language(language);</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="keywordflow">if</span> (stream_muxer_options.bandwidth != 0) {</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    text_media_info-&gt;set_bandwidth(stream_muxer_options.bandwidth);</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    <span class="comment">// Text files are usually small and since the input is one file; there&#39;s no</span></div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="comment">// way for the player to do ranged requests. So set this value to something</span></div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    <span class="comment">// reasonable.</span></div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    text_media_info-&gt;set_bandwidth(256);</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  }</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  MediaInfo::TextInfo* text_info = text_media_info-&gt;mutable_text_info();</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  text_info-&gt;set_format(format);</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="keywordflow">if</span> (!language.empty())</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    text_info-&gt;set_language(language);</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;}</div>
 <div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;}</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;std::unique_ptr&lt;Muxer&gt; CreateOutputMuxer(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;                                         MediaContainerName container) {</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">if</span> (container == CONTAINER_WEBM) {</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> webm::WebMMuxer(options));</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (container == CONTAINER_MPEG2TS) {</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp2t::TsMuxer(options));</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;    DCHECK_EQ(container, CONTAINER_MOV);</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp4::MP4Muxer(options));</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  }</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;}</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;<span class="keywordtype">bool</span> CreateRemuxJobs(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors,</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;                     <span class="keyword">const</span> MuxerOptions&amp; muxer_options,</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;                     FakeClock* fake_clock,</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;                     KeySource* key_source,</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;                     MpdNotifier* mpd_notifier,</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;                     hls::HlsNotifier* hls_notifier,</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;                     std::vector&lt;RemuxJob*&gt;* remux_jobs) {</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  <span class="comment">// No notifiers OR (mpd_notifier XOR hls_notifier); which is NAND.</span></div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  DCHECK(!(mpd_notifier &amp;&amp; hls_notifier));</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  DCHECK(remux_jobs);</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;  std::string previous_input;</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  <span class="keywordtype">int</span> stream_number = 0;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  <span class="keywordflow">for</span> (StreamDescriptorList::const_iterator</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;           stream_iter = stream_descriptors.begin();</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;       stream_iter != stream_descriptors.end();</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;       ++stream_iter, ++stream_number) {</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;    <span class="comment">// Process stream descriptor.</span></div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;    MuxerOptions stream_muxer_options(muxer_options);</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    stream_muxer_options.output_file_name = stream_iter-&gt;output;</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    <span class="keywordflow">if</span> (!stream_iter-&gt;segment_template.empty()) {</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;      <span class="keywordflow">if</span> (!ValidateSegmentTemplate(stream_iter-&gt;segment_template)) {</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ERROR: segment template with &#39;&quot;</span></div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;                   &lt;&lt; stream_iter-&gt;segment_template &lt;&lt; <span class="stringliteral">&quot;&#39; is invalid.&quot;</span>;</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;      }</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;      stream_muxer_options.segment_template = stream_iter-&gt;segment_template;</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;      <span class="keywordflow">if</span> (stream_muxer_options.single_segment) {</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;        LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Segment template and single segment are incompatible, &quot;</span></div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;                        <span class="stringliteral">&quot;setting single segment to false.&quot;</span>;</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;        stream_muxer_options.single_segment = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;      }</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;    }</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;    stream_muxer_options.bandwidth = stream_iter-&gt;bandwidth;</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;    <span class="comment">// Handle text input.</span></div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;    <span class="keywordflow">if</span> (stream_iter-&gt;stream_selector == <span class="stringliteral">&quot;text&quot;</span>) {</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;      MediaInfo text_media_info;</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;      <span class="keywordflow">if</span> (!StreamInfoToTextMediaInfo(*stream_iter, stream_muxer_options,</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;                                     &amp;text_media_info)) {</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;      }</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;      <span class="keywordflow">if</span> (mpd_notifier) {</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;        uint32_t unused;</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;        <span class="keywordflow">if</span> (!mpd_notifier-&gt;NotifyNewContainer(text_media_info, &amp;unused)) {</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to process text file &quot;</span> &lt;&lt; stream_iter-&gt;input;</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;        } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;          mpd_notifier-&gt;Flush();</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;        }</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;        <a class="code" href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html#ae0a573e1c785164f40bfbfba2ced6a16">VodMediaInfoDumpMuxerListener::WriteMediaInfoToFile</a>(</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;            text_media_info,</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;            stream_muxer_options.output_file_name + kMediaInfoSuffix);</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;        NOTIMPLEMENTED()</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;            &lt;&lt; <span class="stringliteral">&quot;--mpd_output or --output_media_info flags are &quot;</span></div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;               <span class="stringliteral">&quot;required for text output. Skipping manifest related output for &quot;</span></div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;            &lt;&lt; stream_iter-&gt;input;</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;      }</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;    }</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;    <span class="keywordflow">if</span> (stream_iter-&gt;input != previous_input) {</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;      <span class="comment">// New remux job needed. Create demux and job thread.</span></div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      std::unique_ptr&lt;Demuxer&gt; demuxer(<span class="keyword">new</span> Demuxer(stream_iter-&gt;input));</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;      <span class="keywordflow">if</span> (FLAGS_enable_widevine_decryption ||</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;          FLAGS_enable_fixed_key_decryption) {</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;        std::unique_ptr&lt;KeySource&gt; key_source(CreateDecryptionKeySource());</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;        <span class="keywordflow">if</span> (!key_source)</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;        demuxer-&gt;SetKeySource(std::move(key_source));</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;      }</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;      Status status = demuxer-&gt;Initialize();</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;      <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Demuxer failed to initialize: &quot;</span> &lt;&lt; status.ToString();</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;      }</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;      <span class="keywordflow">if</span> (FLAGS_dump_stream_info) {</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;        printf(<span class="stringliteral">&quot;\nFile \&quot;%s\&quot;:\n&quot;</span>, stream_iter-&gt;input.c_str());</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;        DumpStreamInfo(demuxer-&gt;streams());</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;        <span class="keywordflow">if</span> (stream_iter-&gt;output.empty())</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;          <span class="keywordflow">continue</span>;  <span class="comment">// just need stream info.</span></div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;      }</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;      remux_jobs-&gt;push_back(<span class="keyword">new</span> RemuxJob(std::move(demuxer)));</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;      previous_input = stream_iter-&gt;input;</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;    }</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;    DCHECK(!remux_jobs-&gt;empty());</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;    std::unique_ptr&lt;Muxer&gt; muxer(</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;        CreateOutputMuxer(stream_muxer_options, stream_iter-&gt;output_format));</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;    <span class="keywordflow">if</span> (FLAGS_use_fake_clock_for_muxer) muxer-&gt;set_clock(fake_clock);</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;    <span class="keywordflow">if</span> (key_source) {</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;      muxer-&gt;SetKeySource(key_source,</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;                          FLAGS_max_sd_pixels,</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;                          FLAGS_clear_lead,</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;                          FLAGS_crypto_period_duration,</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;                          GetProtectionScheme(FLAGS_protection_scheme));</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    }</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    std::unique_ptr&lt;MuxerListener&gt; muxer_listener;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;    DCHECK(!(FLAGS_output_media_info &amp;&amp; mpd_notifier));</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;      <span class="keyword">const</span> std::string output_media_info_file_name =</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;          stream_muxer_options.output_file_name + kMediaInfoSuffix;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;      std::unique_ptr&lt;VodMediaInfoDumpMuxerListener&gt;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;          vod_media_info_dump_muxer_listener(</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;              <span class="keyword">new</span> VodMediaInfoDumpMuxerListener(output_media_info_file_name));</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;      muxer_listener = std::move(vod_media_info_dump_muxer_listener);</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;    }</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    <span class="keywordflow">if</span> (mpd_notifier) {</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;      std::unique_ptr&lt;MpdNotifyMuxerListener&gt; mpd_notify_muxer_listener(</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;          <span class="keyword">new</span> MpdNotifyMuxerListener(mpd_notifier));</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;      muxer_listener = std::move(mpd_notify_muxer_listener);</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    }</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;    <span class="keywordflow">if</span> (hls_notifier) {</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;      <span class="comment">// TODO(rkuroiwa): Do some smart stuff to group the audios, e.g. detect</span></div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;      <span class="comment">// languages.</span></div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;      std::string group_id = stream_iter-&gt;hls_group_id;</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;      std::string name = stream_iter-&gt;hls_name;</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;      std::string hls_playlist_name = stream_iter-&gt;hls_playlist_name;</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      <span class="keywordflow">if</span> (group_id.empty())</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;        group_id = <span class="stringliteral">&quot;audio&quot;</span>;</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;      <span class="keywordflow">if</span> (name.empty())</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;        name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d&quot;</span>, stream_number);</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      <span class="keywordflow">if</span> (hls_playlist_name.empty())</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;        hls_playlist_name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d.m3u8&quot;</span>, stream_number);</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;      muxer_listener.reset(<span class="keyword">new</span> HlsNotifyMuxerListener(hls_playlist_name, name,</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;                                                      group_id, hls_notifier));</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;    }</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;std::unique_ptr&lt;Muxer&gt; CreateOutputMuxer(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;                                         MediaContainerName container) {</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;  <span class="keywordflow">if</span> (container == CONTAINER_WEBM) {</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> webm::WebMMuxer(options));</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (container == CONTAINER_MPEG2TS) {</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp2t::TsMuxer(options));</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    DCHECK_EQ(container, CONTAINER_MOV);</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp4::MP4Muxer(options));</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  }</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;}</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;<span class="keywordtype">bool</span> CreateRemuxJobs(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors,</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;                     <span class="keyword">const</span> MuxerOptions&amp; muxer_options,</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;                     FakeClock* fake_clock,</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;                     KeySource* key_source,</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;                     MpdNotifier* mpd_notifier,</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;                     hls::HlsNotifier* hls_notifier,</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;                     std::vector&lt;std::unique_ptr&lt;RemuxJob&gt;&gt;* remux_jobs) {</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;  <span class="comment">// No notifiers OR (mpd_notifier XOR hls_notifier); which is NAND.</span></div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;  DCHECK(!(mpd_notifier &amp;&amp; hls_notifier));</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  DCHECK(remux_jobs);</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  std::string previous_input;</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  <span class="keywordtype">int</span> stream_number = 0;</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  <span class="keywordflow">for</span> (StreamDescriptorList::const_iterator</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;           stream_iter = stream_descriptors.begin();</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;       stream_iter != stream_descriptors.end();</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;       ++stream_iter, ++stream_number) {</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="comment">// Process stream descriptor.</span></div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;    MuxerOptions stream_muxer_options(muxer_options);</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    stream_muxer_options.output_file_name = stream_iter-&gt;output;</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;    <span class="keywordflow">if</span> (!stream_iter-&gt;segment_template.empty()) {</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;      <span class="keywordflow">if</span> (!ValidateSegmentTemplate(stream_iter-&gt;segment_template)) {</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ERROR: segment template with &#39;&quot;</span></div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;                   &lt;&lt; stream_iter-&gt;segment_template &lt;&lt; <span class="stringliteral">&quot;&#39; is invalid.&quot;</span>;</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      }</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;      stream_muxer_options.segment_template = stream_iter-&gt;segment_template;</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;      <span class="keywordflow">if</span> (stream_muxer_options.single_segment) {</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;        LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Segment template and single segment are incompatible, &quot;</span></div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;                        <span class="stringliteral">&quot;setting single segment to false.&quot;</span>;</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;        stream_muxer_options.single_segment = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;      }</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;    }</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;    stream_muxer_options.bandwidth = stream_iter-&gt;bandwidth;</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;    <span class="comment">// Handle text input.</span></div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;    <span class="keywordflow">if</span> (stream_iter-&gt;stream_selector == <span class="stringliteral">&quot;text&quot;</span>) {</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;      MediaInfo text_media_info;</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;      <span class="keywordflow">if</span> (!StreamInfoToTextMediaInfo(*stream_iter, stream_muxer_options,</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;                                     &amp;text_media_info)) {</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;      }</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;      <span class="keywordflow">if</span> (mpd_notifier) {</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;        uint32_t unused;</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;        <span class="keywordflow">if</span> (!mpd_notifier-&gt;NotifyNewContainer(text_media_info, &amp;unused)) {</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to process text file &quot;</span> &lt;&lt; stream_iter-&gt;input;</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;        } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;          mpd_notifier-&gt;Flush();</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;        }</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;        <a class="code" href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html#ae0a573e1c785164f40bfbfba2ced6a16">VodMediaInfoDumpMuxerListener::WriteMediaInfoToFile</a>(</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;            text_media_info,</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;            stream_muxer_options.output_file_name + kMediaInfoSuffix);</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        NOTIMPLEMENTED()</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;            &lt;&lt; <span class="stringliteral">&quot;--mpd_output or --output_media_info flags are &quot;</span></div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;               <span class="stringliteral">&quot;required for text output. Skipping manifest related output for &quot;</span></div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;            &lt;&lt; stream_iter-&gt;input;</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;      }</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;    }</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;    <span class="keywordflow">if</span> (stream_iter-&gt;input != previous_input) {</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;      <span class="comment">// New remux job needed. Create demux and job thread.</span></div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;      std::unique_ptr&lt;Demuxer&gt; demuxer(<span class="keyword">new</span> Demuxer(stream_iter-&gt;input));</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;      <span class="keywordflow">if</span> (FLAGS_enable_widevine_decryption ||</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;          FLAGS_enable_fixed_key_decryption) {</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;        std::unique_ptr&lt;KeySource&gt; key_source(CreateDecryptionKeySource());</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;        <span class="keywordflow">if</span> (!key_source)</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;        demuxer-&gt;SetKeySource(std::move(key_source));</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      }</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;      Status status = demuxer-&gt;Initialize();</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;      <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Demuxer failed to initialize: &quot;</span> &lt;&lt; status.ToString();</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;      }</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;      <span class="keywordflow">if</span> (FLAGS_dump_stream_info) {</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;        printf(<span class="stringliteral">&quot;\nFile \&quot;%s\&quot;:\n&quot;</span>, stream_iter-&gt;input.c_str());</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;        DumpStreamInfo(demuxer-&gt;streams());</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;        <span class="keywordflow">if</span> (stream_iter-&gt;output.empty())</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;          <span class="keywordflow">continue</span>;  <span class="comment">// just need stream info.</span></div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;      }</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;      remux_jobs-&gt;emplace_back(<span class="keyword">new</span> RemuxJob(std::move(demuxer)));</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;      previous_input = stream_iter-&gt;input;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;    }</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;    DCHECK(!remux_jobs-&gt;empty());</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;    std::unique_ptr&lt;Muxer&gt; muxer(</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;        CreateOutputMuxer(stream_muxer_options, stream_iter-&gt;output_format));</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;    <span class="keywordflow">if</span> (FLAGS_use_fake_clock_for_muxer) muxer-&gt;set_clock(fake_clock);</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;    <span class="keywordflow">if</span> (key_source) {</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;      muxer-&gt;SetKeySource(key_source,</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;                          FLAGS_max_sd_pixels,</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;                          FLAGS_clear_lead,</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;                          FLAGS_crypto_period_duration,</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;                          GetProtectionScheme(FLAGS_protection_scheme));</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;    }</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;    std::unique_ptr&lt;MuxerListener&gt; muxer_listener;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    DCHECK(!(FLAGS_output_media_info &amp;&amp; mpd_notifier));</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;    <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;      <span class="keyword">const</span> std::string output_media_info_file_name =</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;          stream_muxer_options.output_file_name + kMediaInfoSuffix;</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;      std::unique_ptr&lt;VodMediaInfoDumpMuxerListener&gt;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;          vod_media_info_dump_muxer_listener(</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;              <span class="keyword">new</span> VodMediaInfoDumpMuxerListener(output_media_info_file_name));</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;      muxer_listener = std::move(vod_media_info_dump_muxer_listener);</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    }</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;    <span class="keywordflow">if</span> (mpd_notifier) {</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;      std::unique_ptr&lt;MpdNotifyMuxerListener&gt; mpd_notify_muxer_listener(</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;          <span class="keyword">new</span> MpdNotifyMuxerListener(mpd_notifier));</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;      muxer_listener = std::move(mpd_notify_muxer_listener);</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    }</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    <span class="keywordflow">if</span> (hls_notifier) {</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;      <span class="comment">// TODO(rkuroiwa): Do some smart stuff to group the audios, e.g. detect</span></div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      <span class="comment">// languages.</span></div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;      std::string group_id = stream_iter-&gt;hls_group_id;</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;      std::string name = stream_iter-&gt;hls_name;</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;      std::string hls_playlist_name = stream_iter-&gt;hls_playlist_name;</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;      <span class="keywordflow">if</span> (group_id.empty())</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;        group_id = <span class="stringliteral">&quot;audio&quot;</span>;</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;      <span class="keywordflow">if</span> (name.empty())</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;        name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d&quot;</span>, stream_number);</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      <span class="keywordflow">if</span> (hls_playlist_name.empty())</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;        hls_playlist_name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d.m3u8&quot;</span>, stream_number);</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      muxer_listener.reset(<span class="keyword">new</span> HlsNotifyMuxerListener(hls_playlist_name, name,</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;                                                      group_id, hls_notifier));</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    }</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;    <span class="keywordflow">if</span> (muxer_listener)</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;      muxer-&gt;SetMuxerListener(std::move(muxer_listener));</div>
 <div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    <span class="keywordflow">if</span> (muxer_listener)</div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;      muxer-&gt;SetMuxerListener(std::move(muxer_listener));</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;    <span class="keywordflow">if</span> (!AddStreamToMuxer(remux_jobs-&gt;back()-&gt;demuxer()-&gt;streams(),</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;                          stream_iter-&gt;stream_selector,</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;                          stream_iter-&gt;language,</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;                          muxer.get())) {</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;    }</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;    remux_jobs-&gt;back()-&gt;AddMuxer(std::move(muxer));</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;  }</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    <span class="keywordflow">if</span> (!AddStreamToMuxer(remux_jobs-&gt;back()-&gt;demuxer()-&gt;streams(),</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;                          stream_iter-&gt;stream_selector,</div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;                          stream_iter-&gt;language,</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;                          muxer.get())) {</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;    }</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;    remux_jobs-&gt;back()-&gt;AddMuxer(std::move(muxer));</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;  }</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;}</div>
 <div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;}</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;Status RunRemuxJobs(<span class="keyword">const</span> std::vector&lt;RemuxJob*&gt;&amp; remux_jobs) {</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="comment">// Start the job threads.</span></div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;RemuxJob*&gt;::const_iterator job_iter = remux_jobs.begin();</div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;       job_iter != remux_jobs.end();</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;       ++job_iter) {</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;    (*job_iter)-&gt;Start();</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  }</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;</div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  <span class="comment">// Wait for all jobs to complete or an error occurs.</span></div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;  Status status;</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  <span class="keywordtype">bool</span> all_joined;</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  <span class="keywordflow">do</span> {</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;    all_joined = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;    <span class="keywordflow">for</span> (std::vector&lt;RemuxJob*&gt;::const_iterator job_iter = remux_jobs.begin();</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;         job_iter != remux_jobs.end();</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;         ++job_iter) {</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;      <span class="keywordflow">if</span> ((*job_iter)-&gt;HasBeenJoined()) {</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;        status = (*job_iter)-&gt;status();</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;        <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;          <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;        all_joined = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;        (*job_iter)-&gt;Join();</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;      }</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;    }</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  } <span class="keywordflow">while</span> (!all_joined &amp;&amp; status.ok());</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;Status RunRemuxJobs(<span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;RemuxJob&gt;&gt;&amp; remux_jobs) {</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="comment">// Start the job threads.</span></div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;RemuxJob&gt;&amp; job : remux_jobs)</div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;    job-&gt;Start();</div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;</div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="comment">// Wait for all jobs to complete or an error occurs.</span></div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  Status status;</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  <span class="keywordtype">bool</span> all_joined;</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  <span class="keywordflow">do</span> {</div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;    all_joined = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;RemuxJob&gt;&amp; job : remux_jobs) {</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;      <span class="keywordflow">if</span> (job-&gt;HasBeenJoined()) {</div>
+<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;        status = job-&gt;status();</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;        <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;          <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;        all_joined = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;        job-&gt;Join();</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;      }</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;    }</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  } <span class="keywordflow">while</span> (!all_joined &amp;&amp; status.ok());</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;}</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;<span class="keywordtype">bool</span> RunPackager(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors) {</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  <span class="keyword">const</span> FourCC protection_scheme = GetProtectionScheme(FLAGS_protection_scheme);</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == FOURCC_NULL)</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;}</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  <span class="keywordflow">if</span> (!AssignFlagsFromProfile())</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;<span class="keywordtype">bool</span> RunPackager(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors) {</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;  <span class="keyword">const</span> FourCC protection_scheme = GetProtectionScheme(FLAGS_protection_scheme);</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == FOURCC_NULL)</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  <span class="keywordflow">if</span> (FLAGS_output_media_info &amp;&amp; !FLAGS_mpd_output.empty()) {</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;ERROR: --output_media_info and --mpd_output do not &quot;</span></div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;                        <span class="stringliteral">&quot;work together.&quot;</span>;</div>
 <div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  <span class="keywordflow">if</span> (!AssignFlagsFromProfile())</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;  <span class="keywordflow">if</span> (FLAGS_output_media_info &amp;&amp; !FLAGS_mpd_output.empty()) {</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;ERROR: --output_media_info and --mpd_output do not &quot;</span></div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;                        <span class="stringliteral">&quot;work together.&quot;</span>;</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  }</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  <span class="keywordflow">if</span> (FLAGS_output_media_info &amp;&amp; !FLAGS_single_segment) {</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;    <span class="comment">// TODO(rkuroiwa, kqyang): Support partial media info dump for live.</span></div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;ERROR: --output_media_info is only supported if &quot;</span></div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;                        <span class="stringliteral">&quot;--single_segment is true.&quot;</span>;</div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  }</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;</div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;  <span class="comment">// Since there isn&#39;t a muxer listener that can output both MPD and HLS,</span></div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;  <span class="comment">// disallow specifying both MPD and HLS flags.</span></div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_mpd_output.empty() &amp;&amp; !FLAGS_hls_master_playlist_output.empty()) {</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot output both MPD and HLS.&quot;</span>;</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;  }</div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;  <span class="comment">// Get basic muxer options.</span></div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;  MuxerOptions muxer_options;</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;  <span class="keywordflow">if</span> (!GetMuxerOptions(&amp;muxer_options))</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;</div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;  MpdOptions mpd_options;</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;  <span class="keywordflow">if</span> (!GetMpdOptions(&amp;mpd_options))</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;  }</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  <span class="keywordflow">if</span> (FLAGS_output_media_info &amp;&amp; !FLAGS_single_segment) {</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;    <span class="comment">// TODO(rkuroiwa, kqyang): Support partial media info dump for live.</span></div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;ERROR: --output_media_info is only supported if &quot;</span></div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;                        <span class="stringliteral">&quot;--single_segment is true.&quot;</span>;</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;  }</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  <span class="comment">// Since there isn&#39;t a muxer listener that can output both MPD and HLS,</span></div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  <span class="comment">// disallow specifying both MPD and HLS flags.</span></div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_mpd_output.empty() &amp;&amp; !FLAGS_hls_master_playlist_output.empty()) {</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot output both MPD and HLS.&quot;</span>;</div>
+<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  }</div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;  <span class="comment">// Get basic muxer options.</span></div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;  MuxerOptions muxer_options;</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;  <span class="keywordflow">if</span> (!GetMuxerOptions(&amp;muxer_options))</div>
+<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;  MpdOptions mpd_options;</div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;  <span class="keywordflow">if</span> (!GetMpdOptions(&amp;mpd_options))</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;  <span class="comment">// Create encryption key source if needed.</span></div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;  std::unique_ptr&lt;KeySource&gt; encryption_key_source;</div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;  <span class="keywordflow">if</span> (FLAGS_enable_widevine_encryption || FLAGS_enable_fixed_key_encryption) {</div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;    encryption_key_source = CreateEncryptionKeySource();</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_source)</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  }</div>
 <div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  <span class="comment">// Create encryption key source if needed.</span></div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  std::unique_ptr&lt;KeySource&gt; encryption_key_source;</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;  <span class="keywordflow">if</span> (FLAGS_enable_widevine_encryption || FLAGS_enable_fixed_key_encryption) {</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;    encryption_key_source = CreateEncryptionKeySource();</div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_source)</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;  }</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;  std::unique_ptr&lt;MpdNotifier&gt; mpd_notifier;</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_mpd_output.empty()) {</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;    DashProfile profile =</div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;        FLAGS_single_segment ? kOnDemandProfile : kLiveProfile;</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;    std::vector&lt;std::string&gt; base_urls = base::SplitString(</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;        FLAGS_base_urls, <span class="stringliteral">&quot;,&quot;</span>, base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;    <span class="keywordflow">if</span> (FLAGS_generate_dash_if_iop_compliant_mpd) {</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> DashIopMpdNotifier(profile, mpd_options, base_urls,</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;                                                FLAGS_mpd_output));</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> SimpleMpdNotifier(profile, mpd_options, base_urls,</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;                                               FLAGS_mpd_output));</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;    }</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;    <span class="keywordflow">if</span> (!mpd_notifier-&gt;Init()) {</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MpdNotifier failed to initialize.&quot;</span>;</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;    }</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  }</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  std::unique_ptr&lt;hls::HlsNotifier&gt; hls_notifier;</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_hls_master_playlist_output.empty()) {</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;    base::FilePath master_playlist_path(</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;        base::FilePath::FromUTF8Unsafe(FLAGS_hls_master_playlist_output));</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;    base::FilePath master_playlist_name = master_playlist_path.BaseName();</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;</div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;    hls_notifier.reset(<span class="keyword">new</span> hls::SimpleHlsNotifier(</div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;        hls::HlsNotifier::HlsProfile::kOnDemandProfile, FLAGS_hls_base_url,</div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;        master_playlist_path.DirName().AsEndingWithSeparator().AsUTF8Unsafe(),</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;        master_playlist_name.AsUTF8Unsafe()));</div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  std::unique_ptr&lt;MpdNotifier&gt; mpd_notifier;</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_mpd_output.empty()) {</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;    DashProfile profile =</div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;        FLAGS_single_segment ? kOnDemandProfile : kLiveProfile;</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    std::vector&lt;std::string&gt; base_urls = base::SplitString(</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;        FLAGS_base_urls, <span class="stringliteral">&quot;,&quot;</span>, base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;    <span class="keywordflow">if</span> (FLAGS_generate_dash_if_iop_compliant_mpd) {</div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> DashIopMpdNotifier(profile, mpd_options, base_urls,</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;                                                FLAGS_mpd_output));</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> SimpleMpdNotifier(profile, mpd_options, base_urls,</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;                                               FLAGS_mpd_output));</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;    }</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;    <span class="keywordflow">if</span> (!mpd_notifier-&gt;Init()) {</div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MpdNotifier failed to initialize.&quot;</span>;</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;    }</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  }</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;</div>
+<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  std::unique_ptr&lt;hls::HlsNotifier&gt; hls_notifier;</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_hls_master_playlist_output.empty()) {</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;    base::FilePath master_playlist_path(</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;        base::FilePath::FromUTF8Unsafe(FLAGS_hls_master_playlist_output));</div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;    base::FilePath master_playlist_name = master_playlist_path.BaseName();</div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;    hls_notifier.reset(<span class="keyword">new</span> hls::SimpleHlsNotifier(</div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;        hls::HlsNotifier::HlsProfile::kOnDemandProfile, FLAGS_hls_base_url,</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;        master_playlist_path.DirName().AsEndingWithSeparator().AsUTF8Unsafe(),</div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;        master_playlist_name.AsUTF8Unsafe()));</div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;  }</div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  std::vector&lt;std::unique_ptr&lt;RemuxJob&gt;&gt; remux_jobs;</div>
+<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;  FakeClock fake_clock;</div>
+<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;  <span class="keywordflow">if</span> (!CreateRemuxJobs(stream_descriptors, muxer_options, &amp;fake_clock,</div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;                       encryption_key_source.get(), mpd_notifier.get(),</div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;                       hls_notifier.get(), &amp;remux_jobs)) {</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;  }</div>
 <div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;</div>
-<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;  std::vector&lt;RemuxJob*&gt; remux_jobs;</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  STLElementDeleter&lt;std::vector&lt;RemuxJob*&gt; &gt; scoped_jobs_deleter(&amp;remux_jobs);</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  FakeClock fake_clock;</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;  <span class="keywordflow">if</span> (!CreateRemuxJobs(stream_descriptors, muxer_options, &amp;fake_clock,</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;                       encryption_key_source.get(), mpd_notifier.get(),</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;                       hls_notifier.get(), &amp;remux_jobs)) {</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;  }</div>
-<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  Status status = RunRemuxJobs(remux_jobs);</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Packaging Error: &quot;</span> &lt;&lt; status.ToString();</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;  Status status = RunRemuxJobs(remux_jobs);</div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Packaging Error: &quot;</span> &lt;&lt; status.ToString();</div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;  }</div>
+<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  <span class="keywordflow">if</span> (hls_notifier) {</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;    <span class="keywordflow">if</span> (!hls_notifier-&gt;Flush())</div>
+<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  }</div>
+<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  <span class="keywordflow">if</span> (mpd_notifier) {</div>
+<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;    <span class="keywordflow">if</span> (!mpd_notifier-&gt;Flush())</div>
+<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  }</div>
 <div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  <span class="keywordflow">if</span> (hls_notifier) {</div>
-<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;    <span class="keywordflow">if</span> (!hls_notifier-&gt;Flush())</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;  }</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  <span class="keywordflow">if</span> (mpd_notifier) {</div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;    <span class="keywordflow">if</span> (!mpd_notifier-&gt;Flush())</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  }</div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  printf(<span class="stringliteral">&quot;Packaging completed successfully.\n&quot;</span>);</div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;}</div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;<span class="keywordtype">int</span> PackagerMain(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span>** argv) {</div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  base::AtExitManager exit;</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;  <span class="comment">// Needed to enable VLOG/DVLOG through --vmodule or --v.</span></div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  base::CommandLine::Init(argc, argv);</div>
 <div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;  printf(<span class="stringliteral">&quot;Packaging completed successfully.\n&quot;</span>);</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;}</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;</div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;<span class="keywordtype">int</span> PackagerMain(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span>** argv) {</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  base::AtExitManager exit;</div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  <span class="comment">// Needed to enable VLOG/DVLOG through --vmodule or --v.</span></div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  base::CommandLine::Init(argc, argv);</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;</div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  <span class="comment">// Set up logging.</span></div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;  logging::LoggingSettings log_settings;</div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  log_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  CHECK(logging::InitLogging(log_settings));</div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;  <span class="comment">// Set up logging.</span></div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  logging::LoggingSettings log_settings;</div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  log_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;</div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;  CHECK(logging::InitLogging(log_settings));</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;</div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  google::SetUsageMessage(base::StringPrintf(kUsage, argv[0]));</div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  google::ParseCommandLineFlags(&amp;argc, &amp;argv, <span class="keyword">true</span>);</div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  <span class="keywordflow">if</span> (argc &lt; 2) {</div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;    <span class="keyword">const</span> std::string version_string = base::StringPrintf(</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;        <span class="stringliteral">&quot;shaka-packager version %s&quot;</span>, GetPackagerVersion().c_str());</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;    google::ShowUsageWithFlags(version_string.c_str());</div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;    <span class="keywordflow">return</span> kSuccess;</div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  }</div>
 <div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  google::SetUsageMessage(base::StringPrintf(kUsage, argv[0]));</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  google::ParseCommandLineFlags(&amp;argc, &amp;argv, <span class="keyword">true</span>);</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  <span class="keywordflow">if</span> (argc &lt; 2) {</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;    <span class="keyword">const</span> std::string version_string = base::StringPrintf(</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;        <span class="stringliteral">&quot;shaka-packager version %s&quot;</span>, GetPackagerVersion().c_str());</div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;    google::ShowUsageWithFlags(version_string.c_str());</div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    <span class="keywordflow">return</span> kSuccess;</div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  }</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d8/daf/namespaceshaka.html#ade3cbb360c0dcaacc5667676af885008">ValidateWidevineCryptoFlags</a>() || !<a class="code" href="../../d8/daf/namespaceshaka.html#abc3f498491fb895860ebdee359935d93">ValidateFixedCryptoFlags</a>())</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;    <span class="keywordflow">return</span> kArgumentValidationFailed;</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  <span class="keywordflow">if</span> (FLAGS_override_version)</div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;    SetPackagerVersionForTesting(FLAGS_test_version);</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  LibcryptoThreading libcrypto_threading;</div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;  <span class="comment">// TODO(tinskip): Make InsertStreamDescriptor a member of</span></div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  <span class="comment">// StreamDescriptorList.</span></div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  StreamDescriptorList stream_descriptors;</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 1; i &lt; argc; ++i) {</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;    <span class="keywordflow">if</span> (!InsertStreamDescriptor(argv[i], &amp;stream_descriptors))</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;      <span class="keywordflow">return</span> kArgumentValidationFailed;</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  }</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  <span class="keywordflow">return</span> RunPackager(stream_descriptors) ? kSuccess : kPackagingFailed;</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;}</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;</div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;<span class="preprocessor">#if defined(OS_WIN)</span></div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;<span class="preprocessor"></span><span class="comment">// Windows wmain, which converts wide character arguments to UTF-8.</span></div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;<span class="keywordtype">int</span> wmain(<span class="keywordtype">int</span> argc, <span class="keywordtype">wchar_t</span>* argv[], <span class="keywordtype">wchar_t</span>* envp[]) {</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  std::unique_ptr&lt;char* [], std::function&lt;void(char**)&gt;&gt; utf8_argv(</div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;      <span class="keyword">new</span> <span class="keywordtype">char</span>*[argc], [argc](<span class="keywordtype">char</span>** utf8_args) {</div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;        <span class="comment">// TODO(tinskip): This leaks, but if this code is enabled, it crashes.</span></div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;        <span class="comment">// Figure out why. I suspect gflags does something funny with the</span></div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;        <span class="comment">// argument array.</span></div>
-<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;        <span class="comment">// for (int idx = 0; idx &lt; argc; ++idx)</span></div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;        <span class="comment">//   delete[] utf8_args[idx];</span></div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;        <span class="keyword">delete</span>[] utf8_args;</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;      });</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;  std::wstring_convert&lt;std::codecvt_utf8&lt;wchar_t&gt;&gt; converter;</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> idx = 0; idx &lt; argc; ++idx) {</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;    std::string utf8_arg(converter.to_bytes(argv[idx]));</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    utf8_arg += <span class="charliteral">&#39;\0&#39;</span>;</div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;    utf8_argv[idx] = <span class="keyword">new</span> <span class="keywordtype">char</span>[utf8_arg.size()];</div>
-<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;    memcpy(utf8_argv[idx], &amp;utf8_arg[0], utf8_arg.size());</div>
-<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;  }</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, utf8_argv.get());</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;}</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;<span class="preprocessor">#else</span></div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;<span class="preprocessor"></span><span class="keywordtype">int</span> main(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span>** argv) {</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, argv);</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;}</div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;<span class="preprocessor">#endif  // defined(OS_WIN)</span></div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d8/daf/namespaceshaka.html#ade3cbb360c0dcaacc5667676af885008">ValidateWidevineCryptoFlags</a>() || !<a class="code" href="../../d8/daf/namespaceshaka.html#abc3f498491fb895860ebdee359935d93">ValidateFixedCryptoFlags</a>())</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;    <span class="keywordflow">return</span> kArgumentValidationFailed;</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;</div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  <span class="keywordflow">if</span> (FLAGS_override_version)</div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;    SetPackagerVersionForTesting(FLAGS_test_version);</div>
+<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  LibcryptoThreading libcrypto_threading;</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  <span class="comment">// TODO(tinskip): Make InsertStreamDescriptor a member of</span></div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  <span class="comment">// StreamDescriptorList.</span></div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  StreamDescriptorList stream_descriptors;</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 1; i &lt; argc; ++i) {</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;    <span class="keywordflow">if</span> (!InsertStreamDescriptor(argv[i], &amp;stream_descriptors))</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;      <span class="keywordflow">return</span> kArgumentValidationFailed;</div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  }</div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;  <span class="keywordflow">return</span> RunPackager(stream_descriptors) ? kSuccess : kPackagingFailed;</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;}</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;<span class="preprocessor">#if defined(OS_WIN)</span></div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;<span class="preprocessor"></span><span class="comment">// Windows wmain, which converts wide character arguments to UTF-8.</span></div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;<span class="keywordtype">int</span> wmain(<span class="keywordtype">int</span> argc, <span class="keywordtype">wchar_t</span>* argv[], <span class="keywordtype">wchar_t</span>* envp[]) {</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  std::unique_ptr&lt;char* [], std::function&lt;void(char**)&gt;&gt; utf8_argv(</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;      <span class="keyword">new</span> <span class="keywordtype">char</span>*[argc], [argc](<span class="keywordtype">char</span>** utf8_args) {</div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;        <span class="comment">// TODO(tinskip): This leaks, but if this code is enabled, it crashes.</span></div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;        <span class="comment">// Figure out why. I suspect gflags does something funny with the</span></div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;        <span class="comment">// argument array.</span></div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;        <span class="comment">// for (int idx = 0; idx &lt; argc; ++idx)</span></div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;        <span class="comment">//   delete[] utf8_args[idx];</span></div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;        <span class="keyword">delete</span>[] utf8_args;</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;      });</div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  std::wstring_convert&lt;std::codecvt_utf8&lt;wchar_t&gt;&gt; converter;</div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> idx = 0; idx &lt; argc; ++idx) {</div>
+<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;    std::string utf8_arg(converter.to_bytes(argv[idx]));</div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;    utf8_arg += <span class="charliteral">&#39;\0&#39;</span>;</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;    utf8_argv[idx] = <span class="keyword">new</span> <span class="keywordtype">char</span>[utf8_arg.size()];</div>
+<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;    memcpy(utf8_argv[idx], &amp;utf8_arg[0], utf8_arg.size());</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;  }</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, utf8_argv.get());</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;}</div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;<span class="preprocessor">#else</span></div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;<span class="preprocessor"></span><span class="keywordtype">int</span> main(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span>** argv) {</div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, argv);</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;}</div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;<span class="preprocessor">#endif  // defined(OS_WIN)</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_afacdff207ba8359eaa029d8b1414c641"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">shaka::media::File::Copy</a></div><div class="ttdeci">static bool Copy(const char *from_file_name, const char *to_file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00203">file.cc:203</a></div></div>
 <div class="ttc" id="namespaceshaka_html_ade3cbb360c0dcaacc5667676af885008"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#ade3cbb360c0dcaacc5667676af885008">shaka::ValidateWidevineCryptoFlags</a></div><div class="ttdeci">bool ValidateWidevineCryptoFlags()</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/widevine__encryption__flags_8cc_source.html#l00065">widevine_encryption_flags.cc:65</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener_html_ae0a573e1c785164f40bfbfba2ced6a16"><div class="ttname"><a href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html#ae0a573e1c785164f40bfbfba2ced6a16">shaka::media::VodMediaInfoDumpMuxerListener::WriteMediaInfoToFile</a></div><div class="ttdeci">static bool WriteMediaInfoToFile(const MediaInfo &amp;media_info, const std::string &amp;output_file_path)</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html#l00105">vod_media_info_dump_muxer_listener.cc:105</a></div></div>
@@ -686,7 +677,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/de7/classshaka_1_1media_1_1TextStreamInfo-members.html b/docs/d2/de7/classshaka_1_1media_1_1TextStreamInfo-members.html
index 983877c854..401a672b82 100644
--- a/docs/d2/de7/classshaka_1_1media_1_1TextStreamInfo-members.html
+++ b/docs/d2/de7/classshaka_1_1media_1_1TextStreamInfo-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/de7/structshaka_1_1media_1_1mp4_1_1Edit-members.html b/docs/d2/de7/structshaka_1_1media_1_1mp4_1_1Edit-members.html
index bbb9b218dc..74cb568e8b 100644
--- a/docs/d2/de7/structshaka_1_1media_1_1mp4_1_1Edit-members.html
+++ b/docs/d2/de7/structshaka_1_1media_1_1mp4_1_1Edit-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/de9/mock__muxer__listener_8h_source.html b/docs/d2/de9/mock__muxer__listener_8h_source.html
index edf1155b91..e66c9b23c8 100644
--- a/docs/d2/de9/mock__muxer__listener_8h_source.html
+++ b/docs/d2/de9/mock__muxer__listener_8h_source.html
@@ -163,7 +163,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/deb/es__parser_8h_source.html b/docs/d2/deb/es__parser_8h_source.html
index 0ea048e591..04a62ff7d5 100644
--- a/docs/d2/deb/es__parser_8h_source.html
+++ b/docs/d2/deb/es__parser_8h_source.html
@@ -145,7 +145,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dee/classshaka_1_1media_1_1mp2t_1_1TsSectionPes-members.html b/docs/d2/dee/classshaka_1_1media_1_1mp2t_1_1TsSectionPes-members.html
index 80ec28c1f3..9a3e28a309 100644
--- a/docs/d2/dee/classshaka_1_1media_1_1mp2t_1_1TsSectionPes-members.html
+++ b/docs/d2/dee/classshaka_1_1media_1_1mp2t_1_1TsSectionPes-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dee/pes__packet__generator_8cc_source.html b/docs/d2/dee/pes__packet__generator_8cc_source.html
index d47be62875..9a27e65275 100644
--- a/docs/d2/dee/pes__packet__generator_8cc_source.html
+++ b/docs/d2/dee/pes__packet__generator_8cc_source.html
@@ -97,90 +97,90 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;algorithm&gt;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;cstring&gt;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_encryptor.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_pattern_cryptor.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/audio_stream_info.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_writer.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/video_stream_info.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/aac_audio_specific_config.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nal_unit_to_byte_stream_converter.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/pes_packet.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">const</span> <span class="keywordtype">bool</span> kEscapeData = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">const</span> uint8_t kVideoStreamId = 0xE0;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">const</span> uint8_t kAudioStreamId = 0xC0;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">const</span> <span class="keywordtype">double</span> kTsTimescale = 90000.0;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">// |target_data| is input as well as output. On success |target_data| contains</span></div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// the encrypted sample. The input data should be Nal unit byte stream.</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="comment">// This function constructs encrypted sample in |encrypted_sample_data| then</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">// swap with target_data on success.</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keywordtype">bool</span> EncryptH264Sample(AesCryptor* encryptor,</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                       std::vector&lt;uint8_t&gt;* target_data) {</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  BufferWriter encrypted_sample_data(target_data-&gt;size() * 1.5);</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> kLeadingClearBytesSize = 32;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="comment">// Any Nalu smaller than 48 bytes shall not be encrypted.</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keyword">const</span> uint64_t kSmallNalUnitSize = 48;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  NaluReader nalu_reader(Nalu::kH264, 0, target_data-&gt;data(),</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                         target_data-&gt;size());</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  NaluReader::Result result;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  Nalu nalu;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordflow">while</span> ((result = nalu_reader.Advance(&amp;nalu)) == NaluReader::Result::kOk) {</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    encrypted_sample_data.AppendInt(static_cast&lt;uint32_t&gt;(0x00000001));</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keyword">const</span> uint64_t nalu_total_size = nalu.header_size() + nalu.payload_size();</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordflow">if</span> (nalu.type() != Nalu::H264NaluType::H264_NonIDRSlice &amp;&amp;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;        nalu.type() != Nalu::H264NaluType::H264_IDRSlice) {</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;      VLOG(3) &lt;&lt; <span class="stringliteral">&quot;Found Nalu type: &quot;</span> &lt;&lt; nalu.type() &lt;&lt; <span class="stringliteral">&quot; skipping encryption.&quot;</span>;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      encrypted_sample_data.AppendArray(nalu.data(), nalu_total_size);</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    }</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordflow">if</span> (nalu_total_size &lt;= kSmallNalUnitSize) {</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      encrypted_sample_data.AppendArray(nalu.data(), nalu_total_size);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    }</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keyword">const</span> uint8_t* current = nalu.data() + kLeadingClearBytesSize;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keyword">const</span> uint64_t bytes_remaining = nalu_total_size - kLeadingClearBytesSize;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">if</span> (!encryptor-&gt;Crypt(current, bytes_remaining,</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;                          const_cast&lt;uint8_t*&gt;(current))) {</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    }</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    EscapeNalByteSequence(nalu.data(), nalu_total_size, &amp;encrypted_sample_data);</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  }</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  encrypted_sample_data.SwapBuffer(target_data);</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;}</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;<span class="keywordtype">bool</span> EncryptAacSample(AesCryptor* encryptor,</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;                      std::vector&lt;uint8_t&gt;* target_data) {</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> kUnencryptedLeaderSize = 16;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">if</span> (target_data-&gt;size() &lt;= kUnencryptedLeaderSize)</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  uint8_t* data_ptr = target_data-&gt;data() + kUnencryptedLeaderSize;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordflow">return</span> encryptor-&gt;Crypt(</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      data_ptr, target_data-&gt;size() - kUnencryptedLeaderSize, data_ptr);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;}</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;PesPacketGenerator::PesPacketGenerator()</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    : pes_packets_deleter_(&amp;pes_packets_) {}</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_encryptor.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_pattern_cryptor.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/audio_stream_info.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_writer.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/video_stream_info.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/aac_audio_specific_config.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nal_unit_to_byte_stream_converter.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/pes_packet.h&quot;</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">const</span> <span class="keywordtype">bool</span> kEscapeData = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">const</span> uint8_t kVideoStreamId = 0xE0;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">const</span> uint8_t kAudioStreamId = 0xC0;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">const</span> <span class="keywordtype">double</span> kTsTimescale = 90000.0;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// |target_data| is input as well as output. On success |target_data| contains</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="comment">// the encrypted sample. The input data should be Nal unit byte stream.</span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">// This function constructs encrypted sample in |encrypted_sample_data| then</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="comment">// swap with target_data on success.</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keywordtype">bool</span> EncryptH264Sample(AesCryptor* encryptor,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                       std::vector&lt;uint8_t&gt;* target_data) {</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  BufferWriter encrypted_sample_data(target_data-&gt;size() * 1.5);</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> kLeadingClearBytesSize = 32;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="comment">// Any Nalu smaller than 48 bytes shall not be encrypted.</span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keyword">const</span> uint64_t kSmallNalUnitSize = 48;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  NaluReader nalu_reader(Nalu::kH264, 0, target_data-&gt;data(),</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;                         target_data-&gt;size());</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  NaluReader::Result result;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  Nalu nalu;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordflow">while</span> ((result = nalu_reader.Advance(&amp;nalu)) == NaluReader::Result::kOk) {</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    encrypted_sample_data.AppendInt(static_cast&lt;uint32_t&gt;(0x00000001));</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">const</span> uint64_t nalu_total_size = nalu.header_size() + nalu.payload_size();</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keywordflow">if</span> (nalu.type() != Nalu::H264NaluType::H264_NonIDRSlice &amp;&amp;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        nalu.type() != Nalu::H264NaluType::H264_IDRSlice) {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      VLOG(3) &lt;&lt; <span class="stringliteral">&quot;Found Nalu type: &quot;</span> &lt;&lt; nalu.type() &lt;&lt; <span class="stringliteral">&quot; skipping encryption.&quot;</span>;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      encrypted_sample_data.AppendArray(nalu.data(), nalu_total_size);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    }</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    <span class="keywordflow">if</span> (nalu_total_size &lt;= kSmallNalUnitSize) {</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      encrypted_sample_data.AppendArray(nalu.data(), nalu_total_size);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    }</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keyword">const</span> uint8_t* current = nalu.data() + kLeadingClearBytesSize;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keyword">const</span> uint64_t bytes_remaining = nalu_total_size - kLeadingClearBytesSize;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="keywordflow">if</span> (!encryptor-&gt;Crypt(current, bytes_remaining,</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;                          const_cast&lt;uint8_t*&gt;(current))) {</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    }</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    EscapeNalByteSequence(nalu.data(), nalu_total_size, &amp;encrypted_sample_data);</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  }</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  encrypted_sample_data.SwapBuffer(target_data);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;}</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;<span class="keywordtype">bool</span> EncryptAacSample(AesCryptor* encryptor,</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;                      std::vector&lt;uint8_t&gt;* target_data) {</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> kUnencryptedLeaderSize = 16;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordflow">if</span> (target_data-&gt;size() &lt;= kUnencryptedLeaderSize)</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  uint8_t* data_ptr = target_data-&gt;data() + kUnencryptedLeaderSize;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="keywordflow">return</span> encryptor-&gt;Crypt(</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      data_ptr, target_data-&gt;size() - kUnencryptedLeaderSize, data_ptr);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;}</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;PesPacketGenerator::PesPacketGenerator() {}</div>
 <div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;PesPacketGenerator::~PesPacketGenerator() {}</div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
 <div class="line"><a name="l00093"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">   93</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">PesPacketGenerator::Initialize</a>(<span class="keyword">const</span> <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>&amp; stream_info) {</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  STLDeleteElements(&amp;pes_packets_);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  pes_packets_.clear();</div>
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  stream_type_ = stream_info.stream_type();</div>
 <div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div>
 <div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">if</span> (stream_type_ == kStreamVideo) {</div>
@@ -237,7 +237,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    }</div>
 <div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    current_processing_pes_-&gt;mutable_data()-&gt;swap(byte_stream);</div>
 <div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    current_processing_pes_-&gt;set_stream_id(kVideoStreamId);</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    pes_packets_.push_back(current_processing_pes_.release());</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    pes_packets_.push_back(std::move(current_processing_pes_));</div>
 <div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
 <div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  }</div>
 <div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  DCHECK_EQ(stream_type_, kStreamAudio);</div>
@@ -264,7 +264,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="comment">// packets.</span></div>
 <div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  current_processing_pes_-&gt;mutable_data()-&gt;swap(aac_frame);</div>
 <div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  current_processing_pes_-&gt;set_stream_id(kAudioStreamId);</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  pes_packets_.push_back(current_processing_pes_.release());</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  pes_packets_.push_back(std::move(current_processing_pes_));</div>
 <div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
 <div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;}</div>
 <div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;</div>
@@ -298,9 +298,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
 <div class="line"><a name="l00210"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">  210</a></span>&#160;std::unique_ptr&lt;PesPacket&gt; <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">PesPacketGenerator::GetNextPesPacket</a>() {</div>
 <div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  DCHECK(!pes_packets_.empty());</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <a class="code" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a>* pes = pes_packets_.front();</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  std::unique_ptr&lt;PesPacket&gt; pes = std::move(pes_packets_.front());</div>
 <div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  pes_packets_.pop_front();</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordflow">return</span> std::unique_ptr&lt;PesPacket&gt;(pes);</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordflow">return</span> pes;</div>
 <div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;}</div>
 <div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;</div>
 <div class="line"><a name="l00217"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">  217</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">PesPacketGenerator::Flush</a>() {</div>
@@ -328,7 +328,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html b/docs/d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html
index dfb5c822a6..a90200500b 100644
--- a/docs/d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html
+++ b/docs/d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html
@@ -128,7 +128,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_count</b> () c
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dfc/classshaka_1_1media_1_1MkvWriter-members.html b/docs/d2/dfc/classshaka_1_1media_1_1MkvWriter-members.html
index 21c6546e54..be6f9c331d 100644
--- a/docs/d2/dfc/classshaka_1_1media_1_1MkvWriter-members.html
+++ b/docs/d2/dfc/classshaka_1_1media_1_1MkvWriter-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d2/dfd/adts__header_8h_source.html b/docs/d2/dfd/adts__header_8h_source.html
index a259f92903..d36f6864f0 100644
--- a/docs/d2/dfd/adts__header_8h_source.html
+++ b/docs/d2/dfd/adts__header_8h_source.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d07/classshaka_1_1media_1_1mp4_1_1BoxReader-members.html b/docs/d3/d07/classshaka_1_1media_1_1mp4_1_1BoxReader-members.html
index 6e375a0482..86aefe0ad6 100644
--- a/docs/d3/d07/classshaka_1_1media_1_1mp4_1_1BoxReader-members.html
+++ b/docs/d3/d07/classshaka_1_1media_1_1mp4_1_1BoxReader-members.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d09/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator-members.html b/docs/d3/d09/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator-members.html
index 7d5ad29d88..ad2e4a3da0 100644
--- a/docs/d3/d09/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator-members.html
+++ b/docs/d3/d09/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html b/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html
index be35a68654..be01ba5f43 100644
--- a/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html
+++ b/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html
@@ -298,7 +298,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html b/docs/d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html
index da51c2b749..e9702007a5 100644
--- a/docs/d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html
+++ b/docs/d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html
@@ -336,7 +336,7 @@ Static Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d12/classshaka_1_1media_1_1LibcryptoThreading-members.html b/docs/d3/d12/classshaka_1_1media_1_1LibcryptoThreading-members.html
index 8a87f749ee..08eb9385c9 100644
--- a/docs/d3/d12/classshaka_1_1media_1_1LibcryptoThreading-members.html
+++ b/docs/d3/d12/classshaka_1_1media_1_1LibcryptoThreading-members.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d15/udp__file__win_8cc_source.html b/docs/d3/d15/udp__file__win_8cc_source.html
index 7fab09ec43..79467daf1e 100644
--- a/docs/d3/d15/udp__file__win_8cc_source.html
+++ b/docs/d3/d15/udp__file__win_8cc_source.html
@@ -160,7 +160,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d18/classshaka_1_1media_1_1mp2t_1_1TsSectionPat-members.html b/docs/d3/d18/classshaka_1_1media_1_1mp2t_1_1TsSectionPat-members.html
index d19bd7909d..117ec3059d 100644
--- a/docs/d3/d18/classshaka_1_1media_1_1mp2t_1_1TsSectionPat-members.html
+++ b/docs/d3/d18/classshaka_1_1media_1_1mp2t_1_1TsSectionPat-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d19/io__cache_8h_source.html b/docs/d3/d19/io__cache_8h_source.html
index 708709894f..ef52a5ed01 100644
--- a/docs/d3/d19/io__cache_8h_source.html
+++ b/docs/d3/d19/io__cache_8h_source.html
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d35/video__slice__header__parser_8cc_source.html b/docs/d3/d35/video__slice__header__parser_8cc_source.html
index 9f0a7e0783..5fa4613a40 100644
--- a/docs/d3/d35/video__slice__header__parser_8cc_source.html
+++ b/docs/d3/d35/video__slice__header__parser_8cc_source.html
@@ -181,9 +181,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;}  <span class="comment">// namespace media</span></div>
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
-<div class="ttc" id="structshaka_1_1media_1_1H264SliceHeader_html"><div class="ttname"><a href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">shaka::media::H264SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00143">h264_parser.h:143</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00187">h265_parser.cc:187</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00404">h265_parser.cc:404</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264SliceHeader_html"><div class="ttname"><a href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">shaka::media::H264SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00144">h264_parser.h:144</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00183">h265_parser.cc:183</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00400">h265_parser.cc:400</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a86143bb8a31825f06668e97bff66ce2c"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">shaka::media::Nalu::type</a></div><div class="ttdeci">int type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00112">nalu_reader.h:112</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H264VideoSliceHeaderParser_html_a5957ea62985810662158c02a163aac60"><div class="ttname"><a href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a5957ea62985810662158c02a163aac60">shaka::media::H264VideoSliceHeaderParser::GetHeaderSize</a></div><div class="ttdeci">int64_t GetHeaderSize(const Nalu &amp;nalu) override</div><div class="ttdoc">Gets the header size of the given NALU. Returns &lt; 0 on error. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d35/video__slice__header__parser_8cc_source.html#l00048">video_slice_header_parser.cc:48</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H265VideoSliceHeaderParser_html_a54459b6748f64be2bd328c5af79798f3"><div class="ttname"><a href="../../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a54459b6748f64be2bd328c5af79798f3">shaka::media::H265VideoSliceHeaderParser::GetHeaderSize</a></div><div class="ttdeci">int64_t GetHeaderSize(const Nalu &amp;nalu) override</div><div class="ttdoc">Gets the header size of the given NALU. Returns &lt; 0 on error. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d35/video__slice__header__parser_8cc_source.html#l00083">video_slice_header_parser.cc:83</a></div></div>
@@ -194,13 +194,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1HEVCDecoderConfigurationRecord_html"><div class="ttname"><a href="../../d4/d8a/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord.html">shaka::media::HEVCDecoderConfigurationRecord</a></div><div class="ttdoc">Class for parsing HEVC decoder configuration record. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/hevc__decoder__configuration__record_8h_source.html#l00022">hevc_decoder_configuration_record.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AVCDecoderConfigurationRecord_html"><div class="ttname"><a href="../../d6/d57/classshaka_1_1media_1_1AVCDecoderConfigurationRecord.html">shaka::media::AVCDecoderConfigurationRecord</a></div><div class="ttdoc">Class for parsing AVC decoder configuration record. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/dc7/avc__decoder__configuration__record_8h_source.html#l00021">avc_decoder_configuration_record.h:21</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1DecoderConfigurationRecord_html_a099efd795f849667ceb69636b1b50820"><div class="ttname"><a href="../../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#a099efd795f849667ceb69636b1b50820">shaka::media::DecoderConfigurationRecord::nalu</a></div><div class="ttdeci">const Nalu &amp; nalu(size_t i) const </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/db2/decoder__configuration__record_8h_source.html#l00044">decoder_configuration_record.h:44</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00513">h265_parser.cc:513</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00508">h265_parser.cc:508</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H264VideoSliceHeaderParser_html_a551bd1e2a852d1a3b23b77df8505b7f7"><div class="ttname"><a href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a551bd1e2a852d1a3b23b77df8505b7f7">shaka::media::H264VideoSliceHeaderParser::Initialize</a></div><div class="ttdeci">bool Initialize(const std::vector&lt; uint8_t &gt; &amp;decoder_configuration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d35/video__slice__header__parser_8cc_source.html#l00029">video_slice_header_parser.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1DecoderConfigurationRecord_html_aaedb464ac806615154dcecafe8314439"><div class="ttname"><a href="../../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#aaedb464ac806615154dcecafe8314439">shaka::media::DecoderConfigurationRecord::nalu_count</a></div><div class="ttdeci">size_t nalu_count() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/db2/decoder__configuration__record_8h_source.html#l00040">decoder_configuration_record.h:40</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d47/structshaka_1_1media_1_1mp4_1_1PrivFrame.html b/docs/d3/d47/structshaka_1_1media_1_1mp4_1_1PrivFrame.html
index 183aa82270..5a4b0b016a 100644
--- a/docs/d3/d47/structshaka_1_1media_1_1mp4_1_1PrivFrame.html
+++ b/docs/d3/d47/structshaka_1_1media_1_1mp4_1_1PrivFrame.html
@@ -129,7 +129,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>value</b></td>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d51/classshaka_1_1media_1_1LibcryptoThreading.html b/docs/d3/d51/classshaka_1_1media_1_1LibcryptoThreading.html
index 7b5037cd1c..9536a5f995 100644
--- a/docs/d3/d51/classshaka_1_1media_1_1LibcryptoThreading.html
+++ b/docs/d3/d51/classshaka_1_1media_1_1LibcryptoThreading.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d56/decrypt__config_8cc_source.html b/docs/d3/d56/decrypt__config_8cc_source.html
index dc0075f555..b5b259b5c7 100644
--- a/docs/d3/d56/decrypt__config_8cc_source.html
+++ b/docs/d3/d56/decrypt__config_8cc_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d61/classshaka_1_1media_1_1File.html b/docs/d3/d61/classshaka_1_1media_1_1File.html
index a0fb6cd6f8..34e12f295d 100644
--- a/docs/d3/d61/classshaka_1_1media_1_1File.html
+++ b/docs/d3/d61/classshaka_1_1media_1_1File.html
@@ -811,7 +811,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d62/continuity__counter_8h_source.html b/docs/d3/d62/continuity__counter_8h_source.html
index 4840e21dff..f03c849101 100644
--- a/docs/d3/d62/continuity__counter_8h_source.html
+++ b/docs/d3/d62/continuity__counter_8h_source.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d62/rcheck_8h_source.html b/docs/d3/d62/rcheck_8h_source.html
index 88eece9772..dcf2a98c39 100644
--- a/docs/d3/d62/rcheck_8h_source.html
+++ b/docs/d3/d62/rcheck_8h_source.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d66/structshaka_1_1media_1_1mp4_1_1DataEntryUrl-members.html b/docs/d3/d66/structshaka_1_1media_1_1mp4_1_1DataEntryUrl-members.html
index 97b864e50c..30d30efc39 100644
--- a/docs/d3/d66/structshaka_1_1media_1_1mp4_1_1DataEntryUrl-members.html
+++ b/docs/d3/d66/structshaka_1_1media_1_1mp4_1_1DataEntryUrl-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html b/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html
index 15724047fb..8ea5212918 100644
--- a/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html
+++ b/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html
@@ -179,7 +179,7 @@ Additional Inherited Members</h2></td></tr>
 <dd>
 An empty scoped_refptr if there was unexpected values in the provided parameters or video track element fields. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d1/d7d/webm__video__client_8cc_source.html#l00051">51</a> of file <a class="el" href="../../d1/d7d/webm__video__client_8cc_source.html">webm_video_client.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/d7d/webm__video__client_8cc_source.html#l00050">50</a> of file <a class="el" href="../../d1/d7d/webm__video__client_8cc_source.html">webm_video_client.cc</a>.</p>
 
 </div>
 </div>
@@ -190,7 +190,7 @@ An empty scoped_refptr if there was unexpected values in the provided parameters
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d6b/fixed__key__source_8cc_source.html b/docs/d3/d6b/fixed__key__source_8cc_source.html
index 9d788ee98b..614d71a1a1 100644
--- a/docs/d3/d6b/fixed__key__source_8cc_source.html
+++ b/docs/d3/d6b/fixed__key__source_8cc_source.html
@@ -247,7 +247,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html b/docs/d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html
index ce760ba647..4ae1b3ec9e 100644
--- a/docs/d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html
+++ b/docs/d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html
@@ -178,7 +178,7 @@ FourCC&#160;</td><td class="memItemRight" valign="bottom"><b>protection_scheme</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d72/fixed__key__source_8h_source.html b/docs/d3/d72/fixed__key__source_8h_source.html
index 8201e50f8f..3b5b87482d 100644
--- a/docs/d3/d72/fixed__key__source_8h_source.html
+++ b/docs/d3/d72/fixed__key__source_8h_source.html
@@ -160,7 +160,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html b/docs/d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html
index 932c3cbe3f..0d8547b2ae 100644
--- a/docs/d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html
+++ b/docs/d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html
@@ -182,7 +182,7 @@ FourCC&#160;</td><td class="memItemRight" valign="bottom"><b>protection_scheme</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html b/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html
index 0ede9c5547..8ff2650ac8 100644
--- a/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html
+++ b/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html
@@ -236,7 +236,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d75/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator-members.html b/docs/d3/d75/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator-members.html
index 2c41d5804a..d48e2b22d9 100644
--- a/docs/d3/d75/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator-members.html
+++ b/docs/d3/d75/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d76/muxer__flags_8h_source.html b/docs/d3/d76/muxer__flags_8h_source.html
index 8c1efd1885..918774d157 100644
--- a/docs/d3/d76/muxer__flags_8h_source.html
+++ b/docs/d3/d76/muxer__flags_8h_source.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d77/structshaka_1_1media_1_1mp4_1_1TextSampleEntry-members.html b/docs/d3/d77/structshaka_1_1media_1_1mp4_1_1TextSampleEntry-members.html
index 9ef1472b3d..cbecfd3417 100644
--- a/docs/d3/d77/structshaka_1_1media_1_1mp4_1_1TextSampleEntry-members.html
+++ b/docs/d3/d77/structshaka_1_1media_1_1mp4_1_1TextSampleEntry-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d7b/classshaka_1_1media_1_1RsaPublicKey-members.html b/docs/d3/d7b/classshaka_1_1media_1_1RsaPublicKey-members.html
index 9efc83015d..6a02ccb2fa 100644
--- a/docs/d3/d7b/classshaka_1_1media_1_1RsaPublicKey-members.html
+++ b/docs/d3/d7b/classshaka_1_1media_1_1RsaPublicKey-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html b/docs/d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html
index 9611a76f33..c71126af58 100644
--- a/docs/d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html
+++ b/docs/d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html
@@ -223,7 +223,7 @@ An empty scoped_refptr if there was unexpected values in the provided parameters
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d80/muxer__util_8h_source.html b/docs/d3/d80/muxer__util_8h_source.html
index c1d475c5cb..7079c6477b 100644
--- a/docs/d3/d80/muxer__util_8h_source.html
+++ b/docs/d3/d80/muxer__util_8h_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d87/structshaka_1_1media_1_1mp4_1_1SampleToChunk.html b/docs/d3/d87/structshaka_1_1media_1_1mp4_1_1SampleToChunk.html
index 084075a6e7..afe149774b 100644
--- a/docs/d3/d87/structshaka_1_1media_1_1mp4_1_1SampleToChunk.html
+++ b/docs/d3/d87/structshaka_1_1media_1_1mp4_1_1SampleToChunk.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html b/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html
index 8931405af8..537b791adf 100644
--- a/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html
+++ b/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html
@@ -112,7 +112,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>operator()</b> (<a cl
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d8d/webm__audio__client_8h_source.html b/docs/d3/d8d/webm__audio__client_8h_source.html
index 268b50e830..11d626a927 100644
--- a/docs/d3/d8d/webm__audio__client_8h_source.html
+++ b/docs/d3/d8d/webm__audio__client_8h_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d90/ec3__audio__util_8cc_source.html b/docs/d3/d90/ec3__audio__util_8cc_source.html
index 47ae2024d4..dbaa4255af 100644
--- a/docs/d3/d90/ec3__audio__util_8cc_source.html
+++ b/docs/d3/d90/ec3__audio__util_8cc_source.html
@@ -245,7 +245,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html b/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html
index 9cf0fb87fa..1483fa63f8 100644
--- a/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html
+++ b/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html
@@ -127,7 +127,7 @@ Result&#160;</td><td class="memItemRight" valign="bottom"><b>ParseSEI</b> (const
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00244">244</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00245">245</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 <li>media/codecs/<a class="el" href="../../dc/d7b/h264__parser_8cc_source.html">h264_parser.cc</a></li>
@@ -135,7 +135,7 @@ Result&#160;</td><td class="memItemRight" valign="bottom"><b>ParseSEI</b> (const
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/da0/ec3__audio__util_8h_source.html b/docs/d3/da0/ec3__audio__util_8h_source.html
index 1cdbb90797..45375605e2 100644
--- a/docs/d3/da0/ec3__audio__util_8h_source.html
+++ b/docs/d3/da0/ec3__audio__util_8h_source.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html b/docs/d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html
index 82dcf37639..8b6c42c8b6 100644
--- a/docs/d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html
+++ b/docs/d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html
@@ -293,7 +293,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/da2/structshaka_1_1media_1_1mp4_1_1SchemeType.html b/docs/d3/da2/structshaka_1_1media_1_1mp4_1_1SchemeType.html
index 0033befd1f..e94e0d566b 100644
--- a/docs/d3/da2/structshaka_1_1media_1_1mp4_1_1SchemeType.html
+++ b/docs/d3/da2/structshaka_1_1media_1_1mp4_1_1SchemeType.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dad/structshaka_1_1media_1_1mp4_1_1ID3v2.html b/docs/d3/dad/structshaka_1_1media_1_1mp4_1_1ID3v2.html
index 525e48d5aa..8d39308e6a 100644
--- a/docs/d3/dad/structshaka_1_1media_1_1mp4_1_1ID3v2.html
+++ b/docs/d3/dad/structshaka_1_1media_1_1mp4_1_1ID3v2.html
@@ -189,7 +189,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/db4/classshaka_1_1media_1_1WebMWebVTTParser-members.html b/docs/d3/db4/classshaka_1_1media_1_1WebMWebVTTParser-members.html
index 906c232174..3022c99831 100644
--- a/docs/d3/db4/classshaka_1_1media_1_1WebMWebVTTParser-members.html
+++ b/docs/d3/db4/classshaka_1_1media_1_1WebMWebVTTParser-members.html
@@ -97,7 +97,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/db5/structshaka_1_1media_1_1mp4_1_1Track.html b/docs/d3/db5/structshaka_1_1media_1_1mp4_1_1Track.html
index 0efaf095c5..d84c4fee9d 100644
--- a/docs/d3/db5/structshaka_1_1media_1_1mp4_1_1Track.html
+++ b/docs/d3/db5/structshaka_1_1media_1_1mp4_1_1Track.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/db6/webm__parser_8cc_source.html b/docs/d3/db6/webm__parser_8cc_source.html
index 69988bfac2..fcd572431e 100644
--- a/docs/d3/db6/webm__parser_8cc_source.html
+++ b/docs/d3/db6/webm__parser_8cc_source.html
@@ -1068,7 +1068,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dbc/seek__head_8cc_source.html b/docs/d3/dbc/seek__head_8cc_source.html
index 5237401974..2fbb213975 100644
--- a/docs/d3/dbc/seek__head_8cc_source.html
+++ b/docs/d3/dbc/seek__head_8cc_source.html
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dbe/demuxer_8cc_source.html b/docs/d3/dbe/demuxer_8cc_source.html
index a539876a2d..d484d0856a 100644
--- a/docs/d3/dbe/demuxer_8cc_source.html
+++ b/docs/d3/dbe/demuxer_8cc_source.html
@@ -97,255 +97,244 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/bind.h&quot;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decryptor_source.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_stream.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/mp2t_media_parser.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/mp4_media_parser.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_media_parser.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webvtt/webvtt_media_parser.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/wvm/wvm_media_parser.h&quot;</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">// 65KB, sufficient to determine the container and likely all init data.</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kInitBufSize = 0x10000;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kBufSize = 0x200000;  <span class="comment">// 2MB</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="comment">// Maximum number of allowed queued samples. If we are receiving a lot of</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="comment">// samples before seeing init_event, something is not right. The number</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="comment">// set here is arbitrary though.</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kQueuedSamplesLimit = 10000;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;}</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
-<div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">   37</a></span>&#160;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">Demuxer::Demuxer</a>(<span class="keyword">const</span> std::string&amp; file_name)</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    : file_name_(file_name),</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      media_file_(NULL),</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      init_event_received_(false),</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;      container_name_(CONTAINER_UNKNOWN),</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      buffer_(new uint8_t[kBufSize]),</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      cancelled_(false) {</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;}</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;Demuxer::~Demuxer() {</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordflow">if</span> (media_file_)</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  STLDeleteElements(&amp;streams_);</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;}</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">   52</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">Demuxer::SetKeySource</a>(std::unique_ptr&lt;KeySource&gt; key_source) {</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  key_source_ = std::move(key_source);</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">   56</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">Demuxer::Initialize</a>() {</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  DCHECK(!media_file_);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  DCHECK(!init_event_received_);</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decryptor_source.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_stream.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/mp2t_media_parser.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp4/mp4_media_parser.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_media_parser.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webvtt/webvtt_media_parser.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/wvm/wvm_media_parser.h&quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// 65KB, sufficient to determine the container and likely all init data.</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kInitBufSize = 0x10000;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kBufSize = 0x200000;  <span class="comment">// 2MB</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="comment">// Maximum number of allowed queued samples. If we are receiving a lot of</span></div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="comment">// samples before seeing init_event, something is not right. The number</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="comment">// set here is arbitrary though.</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kQueuedSamplesLimit = 10000;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;}</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
+<div class="line"><a name="l00036"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">   36</a></span>&#160;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">Demuxer::Demuxer</a>(<span class="keyword">const</span> std::string&amp; file_name)</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    : file_name_(file_name),</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      media_file_(NULL),</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      init_event_received_(false),</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      container_name_(CONTAINER_UNKNOWN),</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;      buffer_(new uint8_t[kBufSize]),</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      cancelled_(false) {</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;}</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;Demuxer::~Demuxer() {</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordflow">if</span> (media_file_)</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;}</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
+<div class="line"><a name="l00050"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">   50</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">Demuxer::SetKeySource</a>(std::unique_ptr&lt;KeySource&gt; key_source) {</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  key_source_ = std::move(key_source);</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;}</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00054"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">   54</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">Demuxer::Initialize</a>() {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  DCHECK(!media_file_);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  DCHECK(!init_event_received_);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  LOG(INFO) &lt;&lt; <span class="stringliteral">&quot;Initialize Demuxer for file &#39;&quot;</span> &lt;&lt; file_name_ &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  LOG(INFO) &lt;&lt; <span class="stringliteral">&quot;Initialize Demuxer for file &#39;&quot;</span> &lt;&lt; file_name_ &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  media_file_ = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name_.c_str(), <span class="stringliteral">&quot;r&quot;</span>);</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordflow">if</span> (!media_file_) {</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                  <span class="stringliteral">&quot;Cannot open file for reading &quot;</span> + file_name_);</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  }</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="comment">// Read enough bytes before detecting the container.</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">size_t</span> bytes_read = 0;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">while</span> (bytes_read &lt; kInitBufSize) {</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    int64_t read_result =</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;        media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer_.get() + bytes_read, kInitBufSize);</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">if</span> (read_result &lt; 0)</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE, <span class="stringliteral">&quot;Cannot read file &quot;</span> + file_name_);</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="keywordflow">if</span> (read_result == 0)</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    bytes_read += read_result;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  }</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  container_name_ = DetermineContainer(buffer_.get(), bytes_read);</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="comment">// Initialize media parser.</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordflow">switch</span> (container_name_) {</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MOV:</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">mp4::MP4MediaParser</a>());</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MPEG2TS:</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">mp2t::Mp2tMediaParser</a>());</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MPEG2PS:</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html">wvm::WvmMediaParser</a>());</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keywordflow">case</span> CONTAINER_WEBM:</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">WebMMediaParser</a>());</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">case</span> CONTAINER_WEBVTT:</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html">WebVttMediaParser</a>());</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;      NOTIMPLEMENTED();</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::UNIMPLEMENTED, <span class="stringliteral">&quot;Container not supported.&quot;</span>);</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  }</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  parser_-&gt;Init(base::Bind(&amp;Demuxer::ParserInitEvent, base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;                base::Bind(&amp;Demuxer::NewSampleEvent, base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;                key_source_.get());</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="comment">// Handle trailing &#39;moov&#39;.</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordflow">if</span> (container_name_ == CONTAINER_MOV)</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keyword">static_cast&lt;</span><a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">mp4::MP4MediaParser</a>*<span class="keyword">&gt;</span>(parser_.get())-&gt;LoadMoov(file_name_);</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keywordflow">if</span> (!parser_-&gt;Parse(buffer_.get(), bytes_read)) {</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    init_parsing_status_ =</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Cannot parse media file &quot;</span> + file_name_);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  }</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="comment">// Parse until init event received or on error.</span></div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="keywordflow">while</span> (!init_event_received_ &amp;&amp; init_parsing_status_.ok())</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    init_parsing_status_ = <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Parse</a>();</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="comment">// Defer error reporting if init completed successfully.</span></div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">return</span> init_event_received_ ? Status::OK : init_parsing_status_;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;}</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;<span class="keywordtype">void</span> Demuxer::ParserInitEvent(</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    <span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;&amp; streams) {</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  init_event_received_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;::const_iterator it = <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>.begin();</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordflow">for</span> (; it != <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>.end(); ++it) {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    streams_.push_back(<span class="keyword">new</span> <a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>(*it, <span class="keyword">this</span>));</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  }</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;}</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  media_file_ = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name_.c_str(), <span class="stringliteral">&quot;r&quot;</span>);</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordflow">if</span> (!media_file_) {</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE,</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;                  <span class="stringliteral">&quot;Cannot open file for reading &quot;</span> + file_name_);</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  }</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="comment">// Read enough bytes before detecting the container.</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">size_t</span> bytes_read = 0;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordflow">while</span> (bytes_read &lt; kInitBufSize) {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    int64_t read_result =</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;        media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer_.get() + bytes_read, kInitBufSize);</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="keywordflow">if</span> (read_result &lt; 0)</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE, <span class="stringliteral">&quot;Cannot read file &quot;</span> + file_name_);</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">if</span> (read_result == 0)</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    bytes_read += read_result;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  }</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  container_name_ = DetermineContainer(buffer_.get(), bytes_read);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="comment">// Initialize media parser.</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordflow">switch</span> (container_name_) {</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MOV:</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">mp4::MP4MediaParser</a>());</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MPEG2TS:</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">mp2t::Mp2tMediaParser</a>());</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="keywordflow">case</span> CONTAINER_MPEG2PS:</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html">wvm::WvmMediaParser</a>());</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">case</span> CONTAINER_WEBM:</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">WebMMediaParser</a>());</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">case</span> CONTAINER_WEBVTT:</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      parser_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html">WebVttMediaParser</a>());</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;      NOTIMPLEMENTED();</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::UNIMPLEMENTED, <span class="stringliteral">&quot;Container not supported.&quot;</span>);</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  }</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  parser_-&gt;Init(base::Bind(&amp;Demuxer::ParserInitEvent, base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                base::Bind(&amp;Demuxer::NewSampleEvent, base::Unretained(<span class="keyword">this</span>)),</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;                key_source_.get());</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="comment">// Handle trailing &#39;moov&#39;.</span></div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">if</span> (container_name_ == CONTAINER_MOV)</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keyword">static_cast&lt;</span><a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">mp4::MP4MediaParser</a>*<span class="keyword">&gt;</span>(parser_.get())-&gt;LoadMoov(file_name_);</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordflow">if</span> (!parser_-&gt;Parse(buffer_.get(), bytes_read)) {</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    init_parsing_status_ =</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Cannot parse media file &quot;</span> + file_name_);</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  }</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="comment">// Parse until init event received or on error.</span></div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="keywordflow">while</span> (!init_event_received_ &amp;&amp; init_parsing_status_.ok())</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    init_parsing_status_ = <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Parse</a>();</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="comment">// Defer error reporting if init completed successfully.</span></div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keywordflow">return</span> init_event_received_ ? Status::OK : init_parsing_status_;</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;}</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;<span class="keywordtype">void</span> Demuxer::ParserInitEvent(</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt;&gt;&amp; stream_infos) {</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  init_event_received_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; stream_info : stream_infos)</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    streams_.emplace_back(<span class="keyword">new</span> <a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>(stream_info, <span class="keyword">this</span>));</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;Demuxer::QueuedSample::QueuedSample(uint32_t local_track_id,</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;                                      scoped_refptr&lt;MediaSample&gt; local_sample)</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    : track_id(local_track_id), sample(local_sample) {}</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;Demuxer::QueuedSample::~QueuedSample() {}</div>
 <div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;Demuxer::QueuedSample::QueuedSample(uint32_t local_track_id,</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;                                      scoped_refptr&lt;MediaSample&gt; local_sample)</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    : track_id(local_track_id), sample(local_sample) {}</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;Demuxer::QueuedSample::~QueuedSample() {}</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;<span class="keywordtype">bool</span> Demuxer::NewSampleEvent(uint32_t track_id,</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                             <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample) {</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordflow">if</span> (!init_event_received_) {</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    <span class="keywordflow">if</span> (queued_samples_.size() &gt;= kQueuedSamplesLimit) {</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Queued samples limit reached: &quot;</span> &lt;&lt; kQueuedSamplesLimit;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    }</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    queued_samples_.push_back(QueuedSample(track_id, sample));</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  }</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  <span class="keywordflow">while</span> (!queued_samples_.empty()) {</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    <span class="keywordflow">if</span> (!PushSample(queued_samples_.front().track_id,</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;                    queued_samples_.front().sample)) {</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    }</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;    queued_samples_.pop_front();</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  }</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">return</span> PushSample(track_id, sample);</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;}</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="keywordtype">bool</span> Demuxer::PushSample(uint32_t track_id,</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;                         <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample) {</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  std::vector&lt;MediaStream*&gt;::iterator it = streams_.begin();</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordflow">for</span> (; it != streams_.end(); ++it) {</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keywordflow">if</span> (track_id == (*it)-&gt;info()-&gt;track_id()) {</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;      Status status = (*it)-&gt;PushSample(sample);</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;      <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Demuxer::PushSample failed with &quot;</span> &lt;&lt; status;</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;      <span class="keywordflow">return</span> status.ok();</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    }</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  }</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Track &quot;</span> &lt;&lt; track_id &lt;&lt; <span class="stringliteral">&quot; not found.&quot;</span>;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;}</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
-<div class="line"><a name="l00173"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">  173</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">Demuxer::Run</a>() {</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  LOG(INFO) &lt;&lt; <span class="stringliteral">&quot;Demuxer::Run() on file &#39;&quot;</span> &lt;&lt; file_name_ &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <span class="comment">// Start the streams.</span></div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;MediaStream*&gt;::iterator it = streams_.begin();</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;       it != streams_.end();</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;       ++it) {</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;    status = (*it)-&gt;Start(MediaStream::kPush);</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;      <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  }</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keywordflow">while</span> (!cancelled_ &amp;&amp; (status = <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Parse</a>()).ok())</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;    <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keywordflow">if</span> (cancelled_ &amp;&amp; status.ok())</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::CANCELLED, <span class="stringliteral">&quot;Demuxer run cancelled&quot;</span>);</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">if</span> (status.error_code() == error::END_OF_STREAM) {</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    <span class="comment">// Push EOS sample to muxer to indicate end of stream.</span></div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample = <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">MediaSample::CreateEOSBuffer</a>();</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    <span class="keywordflow">for</span> (std::vector&lt;MediaStream*&gt;::iterator it = streams_.begin();</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;         it != streams_.end();</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;         ++it) {</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;      status = (*it)-&gt;PushSample(sample);</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;      <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;        <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    }</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  }</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;}</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;<span class="keywordtype">bool</span> Demuxer::NewSampleEvent(uint32_t track_id,</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;                             <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample) {</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  <span class="keywordflow">if</span> (!init_event_received_) {</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">if</span> (queued_samples_.size() &gt;= kQueuedSamplesLimit) {</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Queued samples limit reached: &quot;</span> &lt;&lt; kQueuedSamplesLimit;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    }</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    queued_samples_.push_back(QueuedSample(track_id, sample));</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  }</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keywordflow">while</span> (!queued_samples_.empty()) {</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    <span class="keywordflow">if</span> (!PushSample(queued_samples_.front().track_id,</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;                    queued_samples_.front().sample)) {</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    }</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    queued_samples_.pop_front();</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  }</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="keywordflow">return</span> PushSample(track_id, sample);</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;}</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="keywordtype">bool</span> Demuxer::PushSample(uint32_t track_id,</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;                         <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample) {</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;MediaStream&gt;&amp; stream : streams_) {</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    <span class="keywordflow">if</span> (track_id == stream-&gt;info()-&gt;track_id()) {</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;      Status status = stream-&gt;PushSample(sample);</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;      <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Demuxer::PushSample failed with &quot;</span> &lt;&lt; status;</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      <span class="keywordflow">return</span> status.ok();</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;    }</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  }</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Track &quot;</span> &lt;&lt; track_id &lt;&lt; <span class="stringliteral">&quot; not found.&quot;</span>;</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;}</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div>
+<div class="line"><a name="l00167"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">  167</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">Demuxer::Run</a>() {</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  LOG(INFO) &lt;&lt; <span class="stringliteral">&quot;Demuxer::Run() on file &#39;&quot;</span> &lt;&lt; file_name_ &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="comment">// Start the streams.</span></div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;MediaStream&gt;&amp; stream : streams_) {</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    status = stream-&gt;Start(MediaStream::kPush);</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;      <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  }</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">while</span> (!cancelled_ &amp;&amp; (status = <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Parse</a>()).ok())</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordflow">if</span> (cancelled_ &amp;&amp; status.ok())</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::CANCELLED, <span class="stringliteral">&quot;Demuxer run cancelled&quot;</span>);</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="keywordflow">if</span> (status.error_code() == error::END_OF_STREAM) {</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    <span class="comment">// Push EOS sample to muxer to indicate end of stream.</span></div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample = <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">MediaSample::CreateEOSBuffer</a>();</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;MediaStream&gt;&amp; stream : streams_) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;      status = stream-&gt;PushSample(sample);</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;      <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;        <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    }</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  }</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;}</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;</div>
+<div class="line"><a name="l00197"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">  197</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Demuxer::Parse</a>() {</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  DCHECK(media_file_);</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  DCHECK(parser_);</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  DCHECK(buffer_);</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="comment">// Return early and avoid call Parse(...) again if it has already failed at</span></div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <span class="comment">// the initialization.</span></div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  <span class="keywordflow">if</span> (!init_parsing_status_.ok())</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    <span class="keywordflow">return</span> init_parsing_status_;</div>
 <div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
-<div class="line"><a name="l00207"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">  207</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">Demuxer::Parse</a>() {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  DCHECK(media_file_);</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  DCHECK(parser_);</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  DCHECK(buffer_);</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="comment">// Return early and avoid call Parse(...) again if it has already failed at</span></div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="comment">// the initialization.</span></div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordflow">if</span> (!init_parsing_status_.ok())</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    <span class="keywordflow">return</span> init_parsing_status_;</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;  int64_t bytes_read = media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer_.get(), kBufSize);</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  <span class="keywordflow">if</span> (bytes_read == 0) {</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    <span class="keywordflow">if</span> (!parser_-&gt;Flush())</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Failed to flush.&quot;</span>);</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::END_OF_STREAM, <span class="stringliteral">&quot;&quot;</span>);</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (bytes_read &lt; 0) {</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE, <span class="stringliteral">&quot;Cannot read file &quot;</span> + file_name_);</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  }</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  int64_t bytes_read = media_file_-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer_.get(), kBufSize);</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="keywordflow">if</span> (bytes_read == 0) {</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    <span class="keywordflow">if</span> (!parser_-&gt;Flush())</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Failed to flush.&quot;</span>);</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::END_OF_STREAM, <span class="stringliteral">&quot;&quot;</span>);</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (bytes_read &lt; 0) {</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::FILE_FAILURE, <span class="stringliteral">&quot;Cannot read file &quot;</span> + file_name_);</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  }</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="keywordflow">return</span> parser_-&gt;Parse(buffer_.get(), bytes_read)</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;             ? Status::OK</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;             : <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE,</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;                      <span class="stringliteral">&quot;Cannot parse media file &quot;</span> + file_name_);</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;}</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;</div>
+<div class="line"><a name="l00222"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">  222</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">Demuxer::Cancel</a>() {</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  cancelled_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;}</div>
 <div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordflow">return</span> parser_-&gt;Parse(buffer_.get(), bytes_read)</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;             ? Status::OK</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;             : <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE,</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;                      <span class="stringliteral">&quot;Cannot parse media file &quot;</span> + file_name_);</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;}</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;</div>
-<div class="line"><a name="l00232"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">  232</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">Demuxer::Cancel</a>() {</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  cancelled_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;}</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_aad6b77e734bb22d077ece029c9e735a4"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">shaka::media::File::Open</a></div><div class="ttdeci">virtual bool Open()=0</div><div class="ttdoc">Internal open. Should not be used directly. </div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html">shaka::media::WebVttMediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d64/webvtt__media__parser_8h_source.html#l00037">webvtt_media_parser.h:37</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1wvm_1_1WvmMediaParser_html"><div class="ttname"><a href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html">shaka::media::wvm::WvmMediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d96/wvm__media__parser_8h_source.html#l00051">wvm_media_parser.h:51</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a9e0b4a430603fdf4639c2153622ae1a2"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">shaka::media::Demuxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00173">demuxer.cc:173</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a9e0b4a430603fdf4639c2153622ae1a2"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">shaka::media::Demuxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00167">demuxer.cc:167</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_a2bfb0c180840356933652a795527b5c8"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">shaka::media::File::Close</a></div><div class="ttdeci">virtual bool Close()=0</div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a117ba5528a92b0cf4752d15d3692e158"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">shaka::media::Demuxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00232">demuxer.cc:232</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a117ba5528a92b0cf4752d15d3692e158"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">shaka::media::Demuxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00222">demuxer.cc:222</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">shaka::media::mp2t::Mp2tMediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d51/mp2t__media__parser_8h_source.html#l00030">mp2t_media_parser.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_af89c3d15b452d45bcacea9470ba43a7f"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">shaka::media::Demuxer::streams</a></div><div class="ttdeci">const std::vector&lt; MediaStream * &gt; &amp; streams()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00068">demuxer.h:68</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMMediaParser_html"><div class="ttname"><a href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">shaka::media::WebMMediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d58/webm__media__parser_8h_source.html#l00019">webm_media_parser.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_abfcf3a9a3f64c0e27497c72324049a1e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(std::unique_ptr&lt; KeySource &gt; key_source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00052">demuxer.cc:52</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_abfcf3a9a3f64c0e27497c72324049a1e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(std::unique_ptr&lt; KeySource &gt; key_source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00050">demuxer.cc:50</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_aed0c0793fd8751330583314a4d3012b9"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">shaka::media::File::Read</a></div><div class="ttdeci">virtual int64_t Read(void *buffer, uint64_t length)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaSample_html_a925efca004ebbcf3cf71f690a3e43788"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">shaka::media::MediaSample::CreateEOSBuffer</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CreateEOSBuffer()</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00080">media_sample.cc:80</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00207">demuxer.cc:207</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a436ed9fd2a3ddd78056ec7cf656fd9ad"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">shaka::media::Demuxer::Initialize</a></div><div class="ttdeci">Status Initialize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00056">demuxer.cc:56</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_ae2fee69f99e5815de4f686b24393402e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">shaka::media::Demuxer::Demuxer</a></div><div class="ttdeci">Demuxer(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00037">demuxer.cc:37</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00197">demuxer.cc:197</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a436ed9fd2a3ddd78056ec7cf656fd9ad"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">shaka::media::Demuxer::Initialize</a></div><div class="ttdeci">Status Initialize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00054">demuxer.cc:54</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_ae2fee69f99e5815de4f686b24393402e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">shaka::media::Demuxer::Demuxer</a></div><div class="ttdeci">Demuxer(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00036">demuxer.cc:36</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">shaka::media::mp4::MP4MediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/d7b/mp4__media__parser_8h_source.html#l00031">mp4_media_parser.h:31</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">shaka::media::MediaStream</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d93/media__stream_8h_source.html#l00026">media_stream.h:26</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dbe/structshaka_1_1media_1_1mp4_1_1EditList.html b/docs/d3/dbe/structshaka_1_1media_1_1mp4_1_1EditList.html
index e8341330ba..b2c7b812c3 100644
--- a/docs/d3/dbe/structshaka_1_1media_1_1mp4_1_1EditList.html
+++ b/docs/d3/dbe/structshaka_1_1media_1_1mp4_1_1EditList.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html b/docs/d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html
index d957491ece..159b8d902f 100644
--- a/docs/d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html
+++ b/docs/d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html
@@ -153,7 +153,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 
 <p>Implements <a class="el" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a26752164d7e8ae6a9a894512291ad9cd">shaka::media::MediaParser</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00173">173</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00170">170</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -205,7 +205,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 
 <p>Implements <a class="el" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153">shaka::media::MediaParser</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00160">160</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00157">157</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -245,7 +245,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 
 <p>Implements <a class="el" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0c85f3cb0591f67c036276be82a1ba9d">shaka::media::MediaParser</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00192">192</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00188">188</a> of file <a class="el" href="../../d1/d74/mp2t__media__parser_8cc_source.html">mp2t_media_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -256,7 +256,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dd0/classshaka_1_1MpdNotifier.html b/docs/d3/dd0/classshaka_1_1MpdNotifier.html
index 976da74e60..d5ebd04d77 100644
--- a/docs/d3/dd0/classshaka_1_1MpdNotifier.html
+++ b/docs/d3/dd0/classshaka_1_1MpdNotifier.html
@@ -472,7 +472,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html b/docs/d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html
index 85bb094f33..b73ee4d258 100644
--- a/docs/d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html
+++ b/docs/d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html
@@ -177,7 +177,7 @@ std::vector&lt; FourCC &gt;&#160;</td><td class="memItemRight" valign="bottom"><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/de4/seek__head_8h_source.html b/docs/d3/de4/seek__head_8h_source.html
index 17a5e56d37..3df0ac5c03 100644
--- a/docs/d3/de4/seek__head_8h_source.html
+++ b/docs/d3/de4/seek__head_8h_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/de9/classshaka_1_1media_1_1mp4_1_1BoxBuffer-members.html b/docs/d3/de9/classshaka_1_1media_1_1mp4_1_1BoxBuffer-members.html
index ec4bde09a0..52e903dc7d 100644
--- a/docs/d3/de9/classshaka_1_1media_1_1mp4_1_1BoxBuffer-members.html
+++ b/docs/d3/de9/classshaka_1_1media_1_1mp4_1_1BoxBuffer-members.html
@@ -121,7 +121,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/de9/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription-members.html b/docs/d3/de9/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription-members.html
index b216d86936..37bd3a3699 100644
--- a/docs/d3/de9/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription-members.html
+++ b/docs/d3/de9/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/df1/box__reader_8cc_source.html b/docs/d3/df1/box__reader_8cc_source.html
index c2f94ca19a..e7a87891aa 100644
--- a/docs/d3/df1/box__reader_8cc_source.html
+++ b/docs/d3/df1/box__reader_8cc_source.html
@@ -260,7 +260,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html b/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html
index 4948c084f9..23bed34c77 100644
--- a/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html
+++ b/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html
@@ -297,7 +297,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html b/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html
index 4a25f05359..17d8690416 100644
--- a/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html
+++ b/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html
@@ -289,8 +289,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_a4cb75da6ff50d6403da18ea8dcc04265"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a4cb75da6ff50d6403da18ea8dcc04265">shaka::media::MuxerListener::OnNewSegment</a></div><div class="ttdeci">virtual void OnNewSegment(const std::string &amp;segment_name, uint64_t start_time, uint64_t duration, uint64_t segment_file_size)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_aad6b77e734bb22d077ece029c9e735a4"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">shaka::media::File::Open</a></div><div class="ttdeci">virtual bool Open()=0</div><div class="ttdoc">Internal open. Should not be used directly. </div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00389">segmenter.cc:389</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_adea4bf88a29660bd8612ae3bc5048068"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">shaka::media::mp4::Segmenter::SetComplete</a></div><div class="ttdeci">void SetComplete()</div><div class="ttdoc">Set progress to 100%. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00405">segmenter.cc:405</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00387">segmenter.cc:387</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_adea4bf88a29660bd8612ae3bc5048068"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">shaka::media::mp4::Segmenter::SetComplete</a></div><div class="ttdeci">void SetComplete()</div><div class="ttdoc">Set progress to 100%. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00403">segmenter.cc:403</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_ad54aef6c349082d996a436ebea11eff2"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#ad54aef6c349082d996a436ebea11eff2">shaka::media::MuxerListener::OnSampleDurationReady</a></div><div class="ttdeci">virtual void OnSampleDurationReady(uint32_t sample_duration)=0</div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a5397ee8759a663aea68261600e528d82"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a5397ee8759a663aea68261600e528d82">shaka::media::MuxerOptions::output_file_name</a></div><div class="ttdeci">std::string output_file_name</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00062">muxer_options.h:62</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_a2bfb0c180840356933652a795527b5c8"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">shaka::media::File::Close</a></div><div class="ttdeci">virtual bool Close()=0</div></div>
@@ -306,7 +306,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d08/classshaka_1_1media_1_1mp4_1_1MP4MediaParser-members.html b/docs/d4/d08/classshaka_1_1media_1_1mp4_1_1MP4MediaParser-members.html
index 20361d04a1..5b122c1fe8 100644
--- a/docs/d4/d08/classshaka_1_1media_1_1mp4_1_1MP4MediaParser-members.html
+++ b/docs/d4/d08/classshaka_1_1media_1_1mp4_1_1MP4MediaParser-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d0b/classshaka_1_1media_1_1TextTrack.html b/docs/d4/d0b/classshaka_1_1media_1_1TextTrack.html
index 79d9d8b593..792806aa8f 100644
--- a/docs/d4/d0b/classshaka_1_1media_1_1TextTrack.html
+++ b/docs/d4/d0b/classshaka_1_1media_1_1TextTrack.html
@@ -109,7 +109,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>addWebVTTCue<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d14/classshaka_1_1media_1_1WebVttMediaParser-members.html b/docs/d4/d14/classshaka_1_1media_1_1WebVttMediaParser-members.html
index 29c9d5bb7e..72e747bc72 100644
--- a/docs/d4/d14/classshaka_1_1media_1_1WebVttMediaParser-members.html
+++ b/docs/d4/d14/classshaka_1_1media_1_1WebVttMediaParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d18/structshaka_1_1media_1_1mp4_1_1EditListEntry.html b/docs/d4/d18/structshaka_1_1media_1_1mp4_1_1EditListEntry.html
index 9e06bf0f59..964b18951c 100644
--- a/docs/d4/d18/structshaka_1_1media_1_1mp4_1_1EditListEntry.html
+++ b/docs/d4/d18/structshaka_1_1media_1_1mp4_1_1EditListEntry.html
@@ -118,7 +118,7 @@ int16_t&#160;</td><td class="memItemRight" valign="bottom"><b>media_rate_fractio
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html b/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html
index 4263946b8f..27d41f352e 100644
--- a/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html
+++ b/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html
@@ -235,7 +235,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d20/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset-members.html b/docs/d4/d20/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset-members.html
index 8219d84326..e7f7fe2e37 100644
--- a/docs/d4/d20/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset-members.html
+++ b/docs/d4/d20/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d2c/structshaka_1_1media_1_1mp4_1_1ID3v2-members.html b/docs/d4/d2c/structshaka_1_1media_1_1mp4_1_1ID3v2-members.html
index cec3c09dc4..9e6ee7f86a 100644
--- a/docs/d4/d2c/structshaka_1_1media_1_1mp4_1_1ID3v2-members.html
+++ b/docs/d4/d2c/structshaka_1_1media_1_1mp4_1_1ID3v2-members.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d33/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox.html b/docs/d4/d33/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox.html
index 005c6a644e..7939c5225c 100644
--- a/docs/d4/d33/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox.html
+++ b/docs/d4/d33/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d37/io__cache_8cc_source.html b/docs/d4/d37/io__cache_8cc_source.html
index d00db8a2be..17fad2c324 100644
--- a/docs/d4/d37/io__cache_8cc_source.html
+++ b/docs/d4/d37/io__cache_8cc_source.html
@@ -254,7 +254,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d3a/structshaka_1_1media_1_1H264Sps-members.html b/docs/d4/d3a/structshaka_1_1media_1_1H264Sps-members.html
index b15072faa4..054c7a6552 100644
--- a/docs/d4/d3a/structshaka_1_1media_1_1H264Sps-members.html
+++ b/docs/d4/d3a/structshaka_1_1media_1_1H264Sps-members.html
@@ -142,7 +142,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d4a/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset-members.html b/docs/d4/d4a/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset-members.html
index 294e8870e8..7d784403f8 100644
--- a/docs/d4/d4a/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset-members.html
+++ b/docs/d4/d4a/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html b/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html
index 116c1cd63d..3e1a02887b 100644
--- a/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html
+++ b/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html
@@ -117,14 +117,14 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>chroma_offset</b> [32]
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00126">126</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00127">127</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html b/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html
index 27512e9cb6..d996f1f953 100644
--- a/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html
+++ b/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html
@@ -158,7 +158,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d59/classshaka_1_1media_1_1WebMWebVTTParser.html b/docs/d4/d59/classshaka_1_1media_1_1WebMWebVTTParser.html
index 2ff7e90169..7d49e47f2a 100644
--- a/docs/d4/d59/classshaka_1_1media_1_1WebMWebVTTParser.html
+++ b/docs/d4/d59/classshaka_1_1media_1_1WebMWebVTTParser.html
@@ -111,7 +111,7 @@ static void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d5c/classshaka_1_1media_1_1DecryptConfig-members.html b/docs/d4/d5c/classshaka_1_1media_1_1DecryptConfig-members.html
index 2b05272f23..8758331e11 100644
--- a/docs/d4/d5c/classshaka_1_1media_1_1DecryptConfig-members.html
+++ b/docs/d4/d5c/classshaka_1_1media_1_1DecryptConfig-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d5d/classshaka_1_1media_1_1UdpFile-members.html b/docs/d4/d5d/classshaka_1_1media_1_1UdpFile-members.html
index eba48bcc0e..138ec6dffd 100644
--- a/docs/d4/d5d/classshaka_1_1media_1_1UdpFile-members.html
+++ b/docs/d4/d5d/classshaka_1_1media_1_1UdpFile-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html b/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html
index c49d83ec67..acf6ad3ba7 100644
--- a/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html
+++ b/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html
@@ -189,7 +189,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#adfbafb780222d3799a53a0e061fb8e73">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00146">146</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00147">147</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -217,7 +217,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#af8149126f4793506bef385d067561dbf">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00156">156</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00157">157</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -246,7 +246,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#ad6171481d6fb437767b1f5b9e0dac1a3">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00061">61</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00062">62</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -307,7 +307,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#acf6a0bde4fc907053cc9f1ff9a38b59a">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00127">127</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00128">128</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -354,7 +354,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#ae10c06fe6022a1020fc889de389be430">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00065">65</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00066">66</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -415,7 +415,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a100236a249477afcda4f50e4914f0eee">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00113">113</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00114">114</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -462,7 +462,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a721edf600dc9165e96e4b6c154a2d4f6">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00101">101</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00102">102</a> of file <a class="el" href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html">dash_iop_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -473,7 +473,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DashIopMpdNotifierTe
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d70/structshaka_1_1SegmentInfo-members.html b/docs/d4/d70/structshaka_1_1SegmentInfo-members.html
index 7d77dd95fa..6cdca09f35 100644
--- a/docs/d4/d70/structshaka_1_1SegmentInfo-members.html
+++ b/docs/d4/d70/structshaka_1_1SegmentInfo-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d87/nalu__reader_8h_source.html b/docs/d4/d87/nalu__reader_8h_source.html
index 824ae93f0a..fd01445ab9 100644
--- a/docs/d4/d87/nalu__reader_8h_source.html
+++ b/docs/d4/d87/nalu__reader_8h_source.html
@@ -299,7 +299,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d8a/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord.html b/docs/d4/d8a/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord.html
index 18fc2bb063..55a342aebe 100644
--- a/docs/d4/d8a/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord.html
+++ b/docs/d4/d8a/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord.html
@@ -171,7 +171,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/d8d/structshaka_1_1media_1_1mp4_1_1EC3Specific.html b/docs/d4/d8d/structshaka_1_1media_1_1mp4_1_1EC3Specific.html
index caa3776e5a..3b78b04cc6 100644
--- a/docs/d4/d8d/structshaka_1_1media_1_1mp4_1_1EC3Specific.html
+++ b/docs/d4/d8d/structshaka_1_1media_1_1mp4_1_1EC3Specific.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/da7/segmenter__test__base_8cc_source.html b/docs/d4/da7/segmenter__test__base_8cc_source.html
index fd9c58e915..610b440f13 100644
--- a/docs/d4/da7/segmenter__test__base_8cc_source.html
+++ b/docs/d4/da7/segmenter__test__base_8cc_source.html
@@ -310,7 +310,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dad/structshaka_1_1media_1_1mp4_1_1SampleEncryption.html b/docs/d4/dad/structshaka_1_1media_1_1mp4_1_1SampleEncryption.html
index ffd5c9d249..0197e2cb5a 100644
--- a/docs/d4/dad/structshaka_1_1media_1_1mp4_1_1SampleEncryption.html
+++ b/docs/d4/dad/structshaka_1_1media_1_1mp4_1_1SampleEncryption.html
@@ -250,7 +250,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/db1/structshaka_1_1media_1_1mp4_1_1CompactSampleSize-members.html b/docs/d4/db1/structshaka_1_1media_1_1mp4_1_1CompactSampleSize-members.html
index c017cc03ba..8cfa948d39 100644
--- a/docs/d4/db1/structshaka_1_1media_1_1mp4_1_1CompactSampleSize-members.html
+++ b/docs/d4/db1/structshaka_1_1media_1_1mp4_1_1CompactSampleSize-members.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/db2/cluster__builder_8h_source.html b/docs/d4/db2/cluster__builder_8h_source.html
index 00693bce6d..8af8b97e36 100644
--- a/docs/d4/db2/cluster__builder_8h_source.html
+++ b/docs/d4/db2/cluster__builder_8h_source.html
@@ -181,7 +181,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html b/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html
index d6f3f2f2f7..f14e628c71 100644
--- a/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html
+++ b/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html
@@ -113,7 +113,7 @@ virtual std::unique_ptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/db9/structshaka_1_1media_1_1mp4_1_1MediaHeader.html b/docs/d4/db9/structshaka_1_1media_1_1mp4_1_1MediaHeader.html
index 98fb7984c2..6483f323d4 100644
--- a/docs/d4/db9/structshaka_1_1media_1_1mp4_1_1MediaHeader.html
+++ b/docs/d4/db9/structshaka_1_1media_1_1mp4_1_1MediaHeader.html
@@ -194,7 +194,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html b/docs/d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html
index 797eb81a39..c593239a74 100644
--- a/docs/d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html
+++ b/docs/d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html
@@ -140,7 +140,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>kElem
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dd3/bit__reader_8h_source.html b/docs/d4/dd3/bit__reader_8h_source.html
index daef2ac9a1..67429a1956 100644
--- a/docs/d4/dd3/bit__reader_8h_source.html
+++ b/docs/d4/dd3/bit__reader_8h_source.html
@@ -187,7 +187,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dd4/structshaka_1_1media_1_1mp4_1_1FullBox-members.html b/docs/d4/dd4/structshaka_1_1media_1_1mp4_1_1FullBox-members.html
index 3a6984e4b4..0b12a20dde 100644
--- a/docs/d4/dd4/structshaka_1_1media_1_1mp4_1_1FullBox-members.html
+++ b/docs/d4/dd4/structshaka_1_1media_1_1mp4_1_1FullBox-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/ddb/classshaka_1_1media_1_1MemoryFile-members.html b/docs/d4/ddb/classshaka_1_1media_1_1MemoryFile-members.html
index 1f7fec5e03..5a64276b13 100644
--- a/docs/d4/ddb/classshaka_1_1media_1_1MemoryFile-members.html
+++ b/docs/d4/ddb/classshaka_1_1media_1_1MemoryFile-members.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dde/webvtt__util_8h_source.html b/docs/d4/dde/webvtt__util_8h_source.html
index 74e52a3419..bb5f8d2300 100644
--- a/docs/d4/dde/webvtt__util_8h_source.html
+++ b/docs/d4/dde/webvtt__util_8h_source.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/de3/structshaka_1_1media_1_1mp4_1_1DataReference.html b/docs/d4/de3/structshaka_1_1media_1_1mp4_1_1DataReference.html
index 1278999003..a62985a84f 100644
--- a/docs/d4/de3/structshaka_1_1media_1_1mp4_1_1DataReference.html
+++ b/docs/d4/de3/structshaka_1_1media_1_1mp4_1_1DataReference.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/de6/classshaka_1_1media_1_1ProgressListener.html b/docs/d4/de6/classshaka_1_1media_1_1ProgressListener.html
index 50bd543623..1b98d3d3ed 100644
--- a/docs/d4/de6/classshaka_1_1media_1_1ProgressListener.html
+++ b/docs/d4/de6/classshaka_1_1media_1_1ProgressListener.html
@@ -146,7 +146,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/de7/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener-members.html b/docs/d4/de7/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener-members.html
index dd2d71cb81..b74d6065ec 100644
--- a/docs/d4/de7/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener-members.html
+++ b/docs/d4/de7/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dec/hls__flags_8h_source.html b/docs/d4/dec/hls__flags_8h_source.html
index c319e1e239..a06b49d3c1 100644
--- a/docs/d4/dec/hls__flags_8h_source.html
+++ b/docs/d4/dec/hls__flags_8h_source.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/df5/request__signer_8cc_source.html b/docs/d4/df5/request__signer_8cc_source.html
index c26b918e67..770e494848 100644
--- a/docs/d4/df5/request__signer_8cc_source.html
+++ b/docs/d4/df5/request__signer_8cc_source.html
@@ -175,11 +175,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1AesRequestSigner_html_a3010ad8c4c1588358a8d31a97afd6428"><div class="ttname"><a href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a3010ad8c4c1588358a8d31a97afd6428">shaka::media::AesRequestSigner::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature) override</div><div class="ttdoc">RequestSigner implementation override. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/df5/request__signer_8cc_source.html#l00050">request_signer.cc:50</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaRequestSigner_html_ac83306b0555581b8ac9591b6e3d3bdbc"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">shaka::media::RsaRequestSigner::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature) override</div><div class="ttdoc">RequestSigner implementation override. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/df5/request__signer_8cc_source.html#l00074">request_signer.cc:74</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesRequestSigner_html"><div class="ttname"><a href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">shaka::media::AesRequestSigner</a></div><div class="ttdoc">AesRequestSigner uses AES-CBC signing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00044">request_signer.h:44</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00097">rsa_key.cc:97</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00096">rsa_key.cc:96</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/df9/structshaka_1_1media_1_1mp4_1_1SegmentIndex.html b/docs/d4/df9/structshaka_1_1media_1_1mp4_1_1SegmentIndex.html
index 1e0d46aeae..1b142793d7 100644
--- a/docs/d4/df9/structshaka_1_1media_1_1mp4_1_1SegmentIndex.html
+++ b/docs/d4/df9/structshaka_1_1media_1_1mp4_1_1SegmentIndex.html
@@ -194,7 +194,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dfa/structshaka_1_1media_1_1mp4_1_1AC3Specific.html b/docs/d4/dfa/structshaka_1_1media_1_1mp4_1_1AC3Specific.html
index 3b84604d54..dceec74309 100644
--- a/docs/d4/dfa/structshaka_1_1media_1_1mp4_1_1AC3Specific.html
+++ b/docs/d4/dfa/structshaka_1_1media_1_1mp4_1_1AC3Specific.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dfd/structshaka_1_1media_1_1H265Sps.html b/docs/d4/dfd/structshaka_1_1media_1_1H265Sps.html
index 4747decc1b..c2c5843805 100644
--- a/docs/d4/dfd/structshaka_1_1media_1_1H265Sps.html
+++ b/docs/d4/dfd/structshaka_1_1media_1_1H265Sps.html
@@ -256,7 +256,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>vui_parameters_presen
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d4/dff/webm__media__parser_8cc_source.html b/docs/d4/dff/webm__media__parser_8cc_source.html
index 8ebbd4a801..316bbe6204 100644
--- a/docs/d4/dff/webm__media__parser_8cc_source.html
+++ b/docs/d4/dff/webm__media__parser_8cc_source.html
@@ -364,7 +364,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html b/docs/d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html
index cff59646dc..c7cb707ad0 100644
--- a/docs/d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html
+++ b/docs/d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d05/structshaka_1_1media_1_1mp4_1_1OriginalFormat.html b/docs/d5/d05/structshaka_1_1media_1_1mp4_1_1OriginalFormat.html
index cca4b51658..a02ab965f1 100644
--- a/docs/d5/d05/structshaka_1_1media_1_1mp4_1_1OriginalFormat.html
+++ b/docs/d5/d05/structshaka_1_1media_1_1mp4_1_1OriginalFormat.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d09/structshaka_1_1media_1_1mp4_1_1CueIDBox.html b/docs/d5/d09/structshaka_1_1media_1_1mp4_1_1CueIDBox.html
index 0889819688..cf0556cfe1 100644
--- a/docs/d5/d09/structshaka_1_1media_1_1mp4_1_1CueIDBox.html
+++ b/docs/d5/d09/structshaka_1_1media_1_1mp4_1_1CueIDBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d11/classshaka_1_1media_1_1WebMInfoParser-members.html b/docs/d5/d11/classshaka_1_1media_1_1WebMInfoParser-members.html
index 5f7dd67eb9..23b96272e7 100644
--- a/docs/d5/d11/classshaka_1_1media_1_1WebMInfoParser-members.html
+++ b/docs/d5/d11/classshaka_1_1media_1_1WebMInfoParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d11/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor.html b/docs/d5/d11/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor.html
index a3389a3495..bea93ec2d0 100644
--- a/docs/d5/d11/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor.html
+++ b/docs/d5/d11/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d13/classshaka_1_1media_1_1ESDescriptor.html b/docs/d5/d13/classshaka_1_1media_1_1ESDescriptor.html
index da3a6cad53..4b4d69d0f8 100644
--- a/docs/d5/d13/classshaka_1_1media_1_1ESDescriptor.html
+++ b/docs/d5/d13/classshaka_1_1media_1_1ESDescriptor.html
@@ -181,7 +181,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>IsDTS</b> () const </
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d15/producer__consumer__queue_8h_source.html b/docs/d5/d15/producer__consumer__queue_8h_source.html
index ddf63703db..764e879a21 100644
--- a/docs/d5/d15/producer__consumer__queue_8h_source.html
+++ b/docs/d5/d15/producer__consumer__queue_8h_source.html
@@ -374,7 +374,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d1a/ts__section_8h_source.html b/docs/d5/d1a/ts__section_8h_source.html
index 8c78f21f56..7659382494 100644
--- a/docs/d5/d1a/ts__section_8h_source.html
+++ b/docs/d5/d1a/ts__section_8h_source.html
@@ -134,7 +134,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d26/classshaka_1_1media_1_1mp4_1_1TrackRunIterator-members.html b/docs/d5/d26/classshaka_1_1media_1_1mp4_1_1TrackRunIterator-members.html
index 00119abe47..8fedcb041f 100644
--- a/docs/d5/d26/classshaka_1_1media_1_1mp4_1_1TrackRunIterator-members.html
+++ b/docs/d5/d26/classshaka_1_1media_1_1mp4_1_1TrackRunIterator-members.html
@@ -122,7 +122,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d27/key__fetcher_8cc_source.html b/docs/d5/d27/key__fetcher_8cc_source.html
index e6befae7ed..4a9e8cf279 100644
--- a/docs/d5/d27/key__fetcher_8cc_source.html
+++ b/docs/d5/d27/key__fetcher_8cc_source.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html b/docs/d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html
index 3080ebacb2..c19e70c070 100644
--- a/docs/d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html
+++ b/docs/d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html
@@ -501,7 +501,7 @@ template&lt;class T &gt; </div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d3b/structshaka_1_1media_1_1mp4_1_1Media-members.html b/docs/d5/d3b/structshaka_1_1media_1_1mp4_1_1Media-members.html
index cde7feb241..702fc642ce 100644
--- a/docs/d5/d3b/structshaka_1_1media_1_1mp4_1_1Media-members.html
+++ b/docs/d5/d3b/structshaka_1_1media_1_1mp4_1_1Media-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html b/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html
index 6b8feb1e90..470ed458c7 100644
--- a/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html
+++ b/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html
@@ -158,7 +158,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d4b/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi-members.html b/docs/d5/d4b/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi-members.html
index d6634b4e44..3c31d94e86 100644
--- a/docs/d5/d4b/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi-members.html
+++ b/docs/d5/d4b/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d4d/box_8cc_source.html b/docs/d5/d4d/box_8cc_source.html
index 48662c8027..2bf7fa052f 100644
--- a/docs/d5/d4d/box_8cc_source.html
+++ b/docs/d5/d4d/box_8cc_source.html
@@ -195,7 +195,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d52/ts__section__pes_8h_source.html b/docs/d5/d52/ts__section__pes_8h_source.html
index 53445b9604..1a56825822 100644
--- a/docs/d5/d52/ts__section__pes_8h_source.html
+++ b/docs/d5/d52/ts__section__pes_8h_source.html
@@ -160,7 +160,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d53/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize-members.html b/docs/d5/d53/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize-members.html
index aba251f999..f6b782f8e6 100644
--- a/docs/d5/d53/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize-members.html
+++ b/docs/d5/d53/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d57/classshaka_1_1RepresentationStateChangeListener-members.html b/docs/d5/d57/classshaka_1_1RepresentationStateChangeListener-members.html
index c2fc817ecb..1997c3a89e 100644
--- a/docs/d5/d57/classshaka_1_1RepresentationStateChangeListener-members.html
+++ b/docs/d5/d57/classshaka_1_1RepresentationStateChangeListener-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d59/classshaka_1_1MockRepresentation-members.html b/docs/d5/d59/classshaka_1_1MockRepresentation-members.html
index 3eebe83207..1b42f2cfca 100644
--- a/docs/d5/d59/classshaka_1_1MockRepresentation-members.html
+++ b/docs/d5/d59/classshaka_1_1MockRepresentation-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d5c/continuity__counter_8cc_source.html b/docs/d5/d5c/continuity__counter_8cc_source.html
index c4b463eea6..d3c64ac355 100644
--- a/docs/d5/d5c/continuity__counter_8cc_source.html
+++ b/docs/d5/d5c/continuity__counter_8cc_source.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html b/docs/d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html
index a5da2cfa5b..364de9f960 100644
--- a/docs/d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html
+++ b/docs/d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html
@@ -161,7 +161,7 @@ const <br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d63/network__util_8cc_source.html b/docs/d5/d63/network__util_8cc_source.html
index f6022973d5..a7b912dbbf 100644
--- a/docs/d5/d63/network__util_8cc_source.html
+++ b/docs/d5/d63/network__util_8cc_source.html
@@ -122,7 +122,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html b/docs/d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html
index e217af5a7d..697a14ba94 100644
--- a/docs/d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html
+++ b/docs/d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html
@@ -229,7 +229,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>NalUnitToByteStreamC
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d6f/vlog__flags_8cc_source.html b/docs/d5/d6f/vlog__flags_8cc_source.html
index 8643eaa431..03a7ddae40 100644
--- a/docs/d5/d6f/vlog__flags_8cc_source.html
+++ b/docs/d5/d6f/vlog__flags_8cc_source.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html b/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html
index 0f34416997..71669a15da 100644
--- a/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html
+++ b/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html
@@ -202,7 +202,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d7b/box__definitions_8h_source.html b/docs/d5/d7b/box__definitions_8h_source.html
index a87f03f0e3..72391ce884 100644
--- a/docs/d5/d7b/box__definitions_8h_source.html
+++ b/docs/d5/d7b/box__definitions_8h_source.html
@@ -1000,7 +1000,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d86/structshaka_1_1media_1_1mp4_1_1MediaInformation.html b/docs/d5/d86/structshaka_1_1media_1_1mp4_1_1MediaInformation.html
index bda42c1574..bdb2c2d2c3 100644
--- a/docs/d5/d86/structshaka_1_1media_1_1mp4_1_1MediaInformation.html
+++ b/docs/d5/d86/structshaka_1_1media_1_1mp4_1_1MediaInformation.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d89/widevine__key__source_8cc_source.html b/docs/d5/d89/widevine__key__source_8cc_source.html
index 759e63e116..1f3bff9f1e 100644
--- a/docs/d5/d89/widevine__key__source_8cc_source.html
+++ b/docs/d5/d89/widevine__key__source_8cc_source.html
@@ -102,630 +102,624 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/json/json_reader.h&quot;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/json/json_writer.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/fixed_key_source.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/http_key_fetcher.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/producer_consumer_queue.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/protection_system_specific_info.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/rcheck.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/request_signer.h&quot;</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/widevine_pssh_data.pb.h&quot;</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">const</span> <span class="keywordtype">bool</span> kEnableKeyRotation = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kLicenseStatusOK[] = <span class="stringliteral">&quot;OK&quot;</span>;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">// Server may return INTERNAL_ERROR intermittently, which is a transient error</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="comment">// and the next client request may succeed without problem.</span></div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kLicenseStatusTransientError[] = <span class="stringliteral">&quot;INTERNAL_ERROR&quot;</span>;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="comment">// Number of times to retry requesting keys in case of a transient error from</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">// the server.</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kNumTransientErrorRetries = 5;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kFirstRetryDelayMilliseconds = 1000;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="comment">// Default crypto period count, which is the number of keys to fetch on every</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="comment">// key rotation enabled request.</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kDefaultCryptoPeriodCount = 10;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kGetKeyTimeoutInSeconds = 5 * 60;  <span class="comment">// 5 minutes.</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kKeyFetchTimeoutInSeconds = 60;  <span class="comment">// 1 minute.</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="keywordtype">bool</span> Base64StringToBytes(<span class="keyword">const</span> std::string&amp; base64_string,</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;                         std::vector&lt;uint8_t&gt;* bytes) {</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  DCHECK(bytes);</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  std::string str;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordflow">if</span> (!base::Base64Decode(base64_string, &amp;str))</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  bytes-&gt;assign(str.begin(), str.end());</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="keywordtype">void</span> BytesToBase64String(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; bytes,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                         std::string* base64_string) {</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  DCHECK(base64_string);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  base::Base64Encode(base::StringPiece(reinterpret_cast&lt;const char*&gt;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                                       (bytes.data()), bytes.size()),</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;                     base64_string);</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;}</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="keywordtype">bool</span> GetKeyFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                     std::vector&lt;uint8_t&gt;* key) {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  DCHECK(key);</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  std::string key_base64_string;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  RCHECK(track_dict.GetString(<span class="stringliteral">&quot;key&quot;</span>, &amp;key_base64_string));</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Key:&quot;</span> &lt;&lt; key_base64_string;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  RCHECK(Base64StringToBytes(key_base64_string, key));</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;}</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="keywordtype">bool</span> GetKeyIdFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                       std::vector&lt;uint8_t&gt;* key_id) {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  DCHECK(key_id);</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  std::string key_id_base64_string;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  RCHECK(track_dict.GetString(<span class="stringliteral">&quot;key_id&quot;</span>, &amp;key_id_base64_string));</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Keyid:&quot;</span> &lt;&lt; key_id_base64_string;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  RCHECK(Base64StringToBytes(key_id_base64_string, key_id));</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;}</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="keywordtype">bool</span> GetPsshDataFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                          std::vector&lt;uint8_t&gt;* pssh_data) {</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  DCHECK(pssh_data);</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keyword">const</span> base::ListValue* pssh_list;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  RCHECK(track_dict.GetList(<span class="stringliteral">&quot;pssh&quot;</span>, &amp;pssh_list));</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// Invariant check. We don&#39;t want to crash in release mode if possible.</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="comment">// The following code handles it gracefully if GetSize() does not return 1.</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  DCHECK_EQ(1u, pssh_list-&gt;GetSize());</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* pssh_dict;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  RCHECK(pssh_list-&gt;GetDictionary(0, &amp;pssh_dict));</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  std::string drm_type;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  RCHECK(pssh_dict-&gt;GetString(<span class="stringliteral">&quot;drm_type&quot;</span>, &amp;drm_type));</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">if</span> (drm_type != <span class="stringliteral">&quot;WIDEVINE&quot;</span>) {</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting drm_type &#39;WIDEVINE&#39;, get &#39;&quot;</span> &lt;&lt; drm_type &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  }</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  std::string pssh_data_base64_string;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  RCHECK(pssh_dict-&gt;GetString(<span class="stringliteral">&quot;data&quot;</span>, &amp;pssh_data_base64_string));</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Pssh Data:&quot;</span> &lt;&lt; pssh_data_base64_string;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  RCHECK(Base64StringToBytes(pssh_data_base64_string, pssh_data));</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;}</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;<span class="comment">// A ref counted wrapper for EncryptionKeyMap.</span></div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;<span class="keyword">class </span>WidevineKeySource::RefCountedEncryptionKeyMap</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    : <span class="keyword">public</span> base::RefCountedThreadSafe&lt;RefCountedEncryptionKeyMap&gt; {</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keyword">explicit</span> RefCountedEncryptionKeyMap(EncryptionKeyMap* encryption_key_map) {</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    DCHECK(encryption_key_map);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    encryption_key_map_.swap(*encryption_key_map);</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  }</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  std::map&lt;KeySource::TrackType, EncryptionKey*&gt;&amp; map() {</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    <span class="keywordflow">return</span> encryption_key_map_;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  }</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/fixed_key_source.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/http_key_fetcher.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/producer_consumer_queue.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/protection_system_specific_info.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/rcheck.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/request_signer.h&quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/widevine_pssh_data.pb.h&quot;</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">const</span> <span class="keywordtype">bool</span> kEnableKeyRotation = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kLicenseStatusOK[] = <span class="stringliteral">&quot;OK&quot;</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="comment">// Server may return INTERNAL_ERROR intermittently, which is a transient error</span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">// and the next client request may succeed without problem.</span></div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kLicenseStatusTransientError[] = <span class="stringliteral">&quot;INTERNAL_ERROR&quot;</span>;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// Number of times to retry requesting keys in case of a transient error from</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="comment">// the server.</span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kNumTransientErrorRetries = 5;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kFirstRetryDelayMilliseconds = 1000;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="comment">// Default crypto period count, which is the number of keys to fetch on every</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="comment">// key rotation enabled request.</span></div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kDefaultCryptoPeriodCount = 10;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kGetKeyTimeoutInSeconds = 5 * 60;  <span class="comment">// 5 minutes.</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kKeyFetchTimeoutInSeconds = 60;  <span class="comment">// 1 minute.</span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="keywordtype">bool</span> Base64StringToBytes(<span class="keyword">const</span> std::string&amp; base64_string,</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                         std::vector&lt;uint8_t&gt;* bytes) {</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  DCHECK(bytes);</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  std::string str;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordflow">if</span> (!base::Base64Decode(base64_string, &amp;str))</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  bytes-&gt;assign(str.begin(), str.end());</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;}</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="keywordtype">void</span> BytesToBase64String(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; bytes,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                         std::string* base64_string) {</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  DCHECK(base64_string);</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  base::Base64Encode(base::StringPiece(reinterpret_cast&lt;const char*&gt;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                                       (bytes.data()), bytes.size()),</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                     base64_string);</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;}</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="keywordtype">bool</span> GetKeyFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                     std::vector&lt;uint8_t&gt;* key) {</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  DCHECK(key);</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  std::string key_base64_string;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  RCHECK(track_dict.GetString(<span class="stringliteral">&quot;key&quot;</span>, &amp;key_base64_string));</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Key:&quot;</span> &lt;&lt; key_base64_string;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  RCHECK(Base64StringToBytes(key_base64_string, key));</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;}</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="keywordtype">bool</span> GetKeyIdFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                       std::vector&lt;uint8_t&gt;* key_id) {</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  DCHECK(key_id);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  std::string key_id_base64_string;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  RCHECK(track_dict.GetString(<span class="stringliteral">&quot;key_id&quot;</span>, &amp;key_id_base64_string));</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Keyid:&quot;</span> &lt;&lt; key_id_base64_string;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  RCHECK(Base64StringToBytes(key_id_base64_string, key_id));</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;}</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="keywordtype">bool</span> GetPsshDataFromTrack(<span class="keyword">const</span> base::DictionaryValue&amp; track_dict,</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;                          std::vector&lt;uint8_t&gt;* pssh_data) {</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  DCHECK(pssh_data);</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="keyword">const</span> base::ListValue* pssh_list;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  RCHECK(track_dict.GetList(<span class="stringliteral">&quot;pssh&quot;</span>, &amp;pssh_list));</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="comment">// Invariant check. We don&#39;t want to crash in release mode if possible.</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// The following code handles it gracefully if GetSize() does not return 1.</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  DCHECK_EQ(1u, pssh_list-&gt;GetSize());</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* pssh_dict;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  RCHECK(pssh_list-&gt;GetDictionary(0, &amp;pssh_dict));</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  std::string drm_type;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  RCHECK(pssh_dict-&gt;GetString(<span class="stringliteral">&quot;drm_type&quot;</span>, &amp;drm_type));</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">if</span> (drm_type != <span class="stringliteral">&quot;WIDEVINE&quot;</span>) {</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting drm_type &#39;WIDEVINE&#39;, get &#39;&quot;</span> &lt;&lt; drm_type &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  }</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  std::string pssh_data_base64_string;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  RCHECK(pssh_dict-&gt;GetString(<span class="stringliteral">&quot;data&quot;</span>, &amp;pssh_data_base64_string));</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;Pssh Data:&quot;</span> &lt;&lt; pssh_data_base64_string;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  RCHECK(Base64StringToBytes(pssh_data_base64_string, pssh_data));</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;}</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;<span class="comment">// A ref counted wrapper for EncryptionKeyMap.</span></div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;<span class="keyword">class </span>WidevineKeySource::RefCountedEncryptionKeyMap</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    : <span class="keyword">public</span> base::RefCountedThreadSafe&lt;RefCountedEncryptionKeyMap&gt; {</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="keyword">explicit</span> RefCountedEncryptionKeyMap(EncryptionKeyMap* encryption_key_map) {</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    DCHECK(encryption_key_map);</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    encryption_key_map_.swap(*encryption_key_map);</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  }</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <span class="keyword">const</span> EncryptionKeyMap&amp; map() { <span class="keywordflow">return</span> encryption_key_map_; }</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>base::RefCountedThreadSafe&lt;RefCountedEncryptionKeyMap&gt;;</div>
 <div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>base::RefCountedThreadSafe&lt;RefCountedEncryptionKeyMap&gt;;</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  ~RefCountedEncryptionKeyMap() { STLDeleteValues(&amp;encryption_key_map_); }</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  EncryptionKeyMap encryption_key_map_;</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  ~RefCountedEncryptionKeyMap() {}</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  EncryptionKeyMap encryption_key_map_;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  DISALLOW_COPY_AND_ASSIGN(RefCountedEncryptionKeyMap);</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;};</div>
 <div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  DISALLOW_COPY_AND_ASSIGN(RefCountedEncryptionKeyMap);</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;};</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
-<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">  137</a></span>&#160;<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">WidevineKeySource::WidevineKeySource</a>(<span class="keyword">const</span> std::string&amp; server_url,</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;                                     <span class="keywordtype">bool</span> add_common_pssh)</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    : key_production_thread_(<span class="stringliteral">&quot;KeyProductionThread&quot;</span>,</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;                             base::Bind(&amp;<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>::FetchKeysTask,</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;                                        base::Unretained(this))),</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;      key_fetcher_(new <a class="code" href="../../d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html">HttpKeyFetcher</a>(kKeyFetchTimeoutInSeconds)),</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;      server_url_(server_url),</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;      crypto_period_count_(kDefaultCryptoPeriodCount),</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;      add_common_pssh_(add_common_pssh),</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;      key_production_started_(false),</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;      start_key_production_(base::WaitableEvent::ResetPolicy::AUTOMATIC,</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;                            base::WaitableEvent::InitialState::NOT_SIGNALED),</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;      first_crypto_period_index_(0) {</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  key_production_thread_.Start();</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;}</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;WidevineKeySource::~WidevineKeySource() {</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  <span class="keywordflow">if</span> (key_pool_)</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    key_pool_-&gt;Stop();</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  <span class="keywordflow">if</span> (key_production_thread_.HasBeenStarted()) {</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    <span class="comment">// Signal the production thread to start key production if it is not</span></div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="comment">// signaled yet so the thread can be joined.</span></div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    start_key_production_.Signal();</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;    key_production_thread_.Join();</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  }</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  STLDeleteValues(&amp;encryption_key_map_);</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;}</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
-<div class="line"><a name="l00165"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a6fb9680be887d3b9367e015029f909f2">  165</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; content_id,</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;                                    <span class="keyword">const</span> std::string&amp; policy) {</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  request_dict_.Clear();</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  std::string content_id_base64_string;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  BytesToBase64String(content_id, &amp;content_id_base64_string);</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;content_id&quot;</span>, content_id_base64_string);</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;policy&quot;</span>, policy);</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;}</div>
+<div class="line"><a name="l00134"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">  134</a></span>&#160;<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">WidevineKeySource::WidevineKeySource</a>(<span class="keyword">const</span> std::string&amp; server_url,</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;                                     <span class="keywordtype">bool</span> add_common_pssh)</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    : key_production_thread_(<span class="stringliteral">&quot;KeyProductionThread&quot;</span>,</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;                             base::Bind(&amp;<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>::FetchKeysTask,</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;                                        base::Unretained(this))),</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;      key_fetcher_(new <a class="code" href="../../d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html">HttpKeyFetcher</a>(kKeyFetchTimeoutInSeconds)),</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;      server_url_(server_url),</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;      crypto_period_count_(kDefaultCryptoPeriodCount),</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;      add_common_pssh_(add_common_pssh),</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;      key_production_started_(false),</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;      start_key_production_(base::WaitableEvent::ResetPolicy::AUTOMATIC,</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;                            base::WaitableEvent::InitialState::NOT_SIGNALED),</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;      first_crypto_period_index_(0) {</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  key_production_thread_.Start();</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;}</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;WidevineKeySource::~WidevineKeySource() {</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="keywordflow">if</span> (key_pool_)</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    key_pool_-&gt;Stop();</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  <span class="keywordflow">if</span> (key_production_thread_.HasBeenStarted()) {</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    <span class="comment">// Signal the production thread to start key production if it is not</span></div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    <span class="comment">// signaled yet so the thread can be joined.</span></div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    start_key_production_.Signal();</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    key_production_thread_.Join();</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  }</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;}</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;</div>
+<div class="line"><a name="l00161"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a6fb9680be887d3b9367e015029f909f2">  161</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; content_id,</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;                                    <span class="keyword">const</span> std::string&amp; policy) {</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  request_dict_.Clear();</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  std::string content_id_base64_string;</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  BytesToBase64String(content_id, &amp;content_id_base64_string);</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;content_id&quot;</span>, content_id_base64_string);</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;policy&quot;</span>, policy);</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;}</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;</div>
+<div class="line"><a name="l00172"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">  172</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) {</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keyword">const</span> std::vector&lt;uint8_t&gt; widevine_system_id(</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;      kWidevineSystemId, kWidevineSystemId + arraysize(kWidevineSystemId));</div>
 <div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">  176</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) {</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keyword">const</span> std::vector&lt;uint8_t&gt; widevine_system_id(</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;      kWidevineSystemId, kWidevineSystemId + arraysize(kWidevineSystemId));</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  <a class="code" href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html">ProtectionSystemSpecificInfo</a> info;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keywordflow">if</span> (!info.<a class="code" href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#a13b0f93b68efff614c5356df081f2560">Parse</a>(pssh_box.data(), pssh_box.size()))</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Error parsing the PSSH box.&quot;</span>);</div>
 <div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <a class="code" href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html">ProtectionSystemSpecificInfo</a> info;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <span class="keywordflow">if</span> (!info.<a class="code" href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#a13b0f93b68efff614c5356df081f2560">Parse</a>(pssh_box.data(), pssh_box.size()))</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::PARSER_FAILURE, <span class="stringliteral">&quot;Error parsing the PSSH box.&quot;</span>);</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  <span class="keywordflow">if</span> (info.system_id() == widevine_system_id) {</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    base::AutoLock scoped_lock(lock_);</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    request_dict_.Clear();</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    std::string pssh_data_base64_string;</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    BytesToBase64String(info.pssh_data(), &amp;pssh_data_base64_string);</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    request_dict_.SetString(<span class="stringliteral">&quot;pssh_data&quot;</span>, pssh_data_base64_string);</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!info.key_ids().empty()) {</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    <span class="comment">// This is not a Widevine PSSH box.  Try making the request for the key-IDs.</span></div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    <span class="comment">// Even if this is a different key-system, it should still work.  Either</span></div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="comment">// the server will not recognize it and return an error, or it will</span></div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    <span class="comment">// recognize it and the key must be correct (or the content is bad).</span></div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">FetchKeys</a>(info.key_ids());</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::NOT_FOUND, <span class="stringliteral">&quot;No key IDs given in PSSH box.&quot;</span>);</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  }</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;}</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;</div>
-<div class="line"><a name="l00203"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae202f5af8c11fe3abe9f7b882ac57513">  203</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) {</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  request_dict_.Clear();</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  std::string pssh_data_base64_string;</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <span class="comment">// Generate Widevine PSSH data from the key-IDs.</span></div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  WidevinePsshData widevine_pssh_data;</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; key_ids.size(); i++) {</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    widevine_pssh_data.add_key_id(key_ids[i].data(), key_ids[i].size());</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  }</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keywordflow">if</span> (info.system_id() == widevine_system_id) {</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    base::AutoLock scoped_lock(lock_);</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;    request_dict_.Clear();</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    std::string pssh_data_base64_string;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    BytesToBase64String(info.pssh_data(), &amp;pssh_data_base64_string);</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    request_dict_.SetString(<span class="stringliteral">&quot;pssh_data&quot;</span>, pssh_data_base64_string);</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!info.key_ids().empty()) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    <span class="comment">// This is not a Widevine PSSH box.  Try making the request for the key-IDs.</span></div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    <span class="comment">// Even if this is a different key-system, it should still work.  Either</span></div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    <span class="comment">// the server will not recognize it and return an error, or it will</span></div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    <span class="comment">// recognize it and the key must be correct (or the content is bad).</span></div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">FetchKeys</a>(info.key_ids());</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::NOT_FOUND, <span class="stringliteral">&quot;No key IDs given in PSSH box.&quot;</span>);</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  }</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;}</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae202f5af8c11fe3abe9f7b882ac57513">  199</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) {</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  request_dict_.Clear();</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  std::string pssh_data_base64_string;</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  <span class="comment">// Generate Widevine PSSH data from the key-IDs.</span></div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  WidevinePsshData widevine_pssh_data;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; key_ids.size(); i++) {</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    widevine_pssh_data.add_key_id(key_ids[i].data(), key_ids[i].size());</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  }</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keyword">const</span> std::string serialized_string = widevine_pssh_data.SerializeAsString();</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  std::vector&lt;uint8_t&gt; pssh_data(serialized_string.begin(),</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;                                 serialized_string.end());</div>
 <div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="keyword">const</span> std::string serialized_string = widevine_pssh_data.SerializeAsString();</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  std::vector&lt;uint8_t&gt; pssh_data(serialized_string.begin(),</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;                                 serialized_string.end());</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  BytesToBase64String(pssh_data, &amp;pssh_data_base64_string);</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;pssh_data&quot;</span>, pssh_data_base64_string);</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;}</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
-<div class="line"><a name="l00224"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ac0be37455c1ec0a7d177e6b78dd5a58e">  224</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(uint32_t asset_id) {</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  request_dict_.Clear();</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  request_dict_.SetDouble(<span class="stringliteral">&quot;asset_id&quot;</span>, asset_id);</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">true</span>);</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;}</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">  233</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">WidevineKeySource::GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  DCHECK(key);</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map_.find(track_type) == encryption_key_map_.end()) {</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::INTERNAL_ERROR,</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;                  <span class="stringliteral">&quot;Cannot find key of type &quot;</span> + <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(track_type));</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  }</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  *key = *encryption_key_map_[track_type];</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;}</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;</div>
-<div class="line"><a name="l00243"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59699cd998290adae74e6596ba44fdc3">  243</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">WidevineKeySource::GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;                                 <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  DCHECK(key);</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  <span class="keywordflow">for</span> (std::map&lt;TrackType, EncryptionKey*&gt;::iterator iter =</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;           encryption_key_map_.begin();</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;       iter != encryption_key_map_.end();</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;       ++iter) {</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    <span class="keywordflow">if</span> (iter-&gt;second-&gt;key_id == key_id) {</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;      *key = *iter-&gt;second;</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;      <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;    }</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  }</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::INTERNAL_ERROR,</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;                <span class="stringliteral">&quot;Cannot find key with specified key ID&quot;</span>);</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;}</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
-<div class="line"><a name="l00259"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">  259</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">WidevineKeySource::GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;                                             TrackType track_type,</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;                                             <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  DCHECK(key_production_thread_.HasBeenStarted());</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="comment">// TODO(kqyang): This is not elegant. Consider refactoring later.</span></div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;  {</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    base::AutoLock scoped_lock(lock_);</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;    <span class="keywordflow">if</span> (!key_production_started_) {</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      <span class="comment">// Another client may have a slightly smaller starting crypto period</span></div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;      <span class="comment">// index. Set the initial value to account for that.</span></div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;      first_crypto_period_index_ =</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;          crypto_period_index ? crypto_period_index - 1 : 0;</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;      DCHECK(!key_pool_);</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;      key_pool_.reset(<span class="keyword">new</span> <a class="code" href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">EncryptionKeyQueue</a>(crypto_period_count_,</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;                                             first_crypto_period_index_));</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;      start_key_production_.Signal();</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;      key_production_started_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;    }</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  }</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  <span class="keywordflow">return</span> GetKeyInternal(crypto_period_index, track_type, key);</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;}</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;</div>
-<div class="line"><a name="l00281"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">  281</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">WidevineKeySource::set_signer</a>(std::unique_ptr&lt;RequestSigner&gt; signer) {</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;  signer_ = std::move(signer);</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;}</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;</div>
-<div class="line"><a name="l00285"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">  285</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">WidevineKeySource::set_key_fetcher</a>(</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;    std::unique_ptr&lt;KeyFetcher&gt; key_fetcher) {</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  key_fetcher_ = std::move(key_fetcher);</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;}</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> WidevineKeySource::GetKeyInternal(uint32_t crypto_period_index,</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                                         TrackType track_type,</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;                                         <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  DCHECK(key_pool_);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  DCHECK(key);</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  DCHECK_LE(track_type, NUM_VALID_TRACK_TYPES);</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;  DCHECK_NE(track_type, TRACK_TYPE_UNKNOWN);</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;  scoped_refptr&lt;RefCountedEncryptionKeyMap&gt; ref_counted_encryption_key_map;</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status =</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;      key_pool_-&gt;Peek(crypto_period_index, &amp;ref_counted_encryption_key_map,</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;                      kGetKeyTimeoutInSeconds * 1000);</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;    <span class="keywordflow">if</span> (status.error_code() == error::STOPPED) {</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;      CHECK(!common_encryption_request_status_.ok());</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;      <span class="keywordflow">return</span> common_encryption_request_status_;</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;    }</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;    <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  BytesToBase64String(pssh_data, &amp;pssh_data_base64_string);</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  request_dict_.SetString(<span class="stringliteral">&quot;pssh_data&quot;</span>, pssh_data_base64_string);</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;}</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;</div>
+<div class="line"><a name="l00220"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ac0be37455c1ec0a7d177e6b78dd5a58e">  220</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">WidevineKeySource::FetchKeys</a>(uint32_t asset_id) {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  base::AutoLock scoped_lock(lock_);</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  request_dict_.Clear();</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  request_dict_.SetDouble(<span class="stringliteral">&quot;asset_id&quot;</span>, asset_id);</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordflow">return</span> FetchKeysInternal(!kEnableKeyRotation, 0, <span class="keyword">true</span>);</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;}</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;</div>
+<div class="line"><a name="l00229"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">  229</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">WidevineKeySource::GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;  DCHECK(key);</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map_.find(track_type) == encryption_key_map_.end()) {</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::INTERNAL_ERROR,</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;                  <span class="stringliteral">&quot;Cannot find key of type &quot;</span> + <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(track_type));</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  }</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  *key = *encryption_key_map_[track_type];</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;}</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;</div>
+<div class="line"><a name="l00239"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59699cd998290adae74e6596ba44fdc3">  239</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">WidevineKeySource::GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;                                 <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;  DCHECK(key);</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> <span class="keyword">auto</span>&amp; pair : encryption_key_map_) {</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="keywordflow">if</span> (pair.second-&gt;key_id == key_id) {</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;      *key = *pair.second;</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;      <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    }</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  }</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::INTERNAL_ERROR,</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;                <span class="stringliteral">&quot;Cannot find key with specified key ID&quot;</span>);</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;}</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;</div>
+<div class="line"><a name="l00252"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">  252</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">WidevineKeySource::GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;                                             TrackType track_type,</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;                                             <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  DCHECK(key_production_thread_.HasBeenStarted());</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;  <span class="comment">// TODO(kqyang): This is not elegant. Consider refactoring later.</span></div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  {</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;    base::AutoLock scoped_lock(lock_);</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="keywordflow">if</span> (!key_production_started_) {</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;      <span class="comment">// Another client may have a slightly smaller starting crypto period</span></div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;      <span class="comment">// index. Set the initial value to account for that.</span></div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;      first_crypto_period_index_ =</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;          crypto_period_index ? crypto_period_index - 1 : 0;</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;      DCHECK(!key_pool_);</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;      key_pool_.reset(<span class="keyword">new</span> <a class="code" href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">EncryptionKeyQueue</a>(crypto_period_count_,</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;                                             first_crypto_period_index_));</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      start_key_production_.Signal();</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;      key_production_started_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;    }</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  }</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;  <span class="keywordflow">return</span> GetKeyInternal(crypto_period_index, track_type, key);</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;}</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;</div>
+<div class="line"><a name="l00274"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">  274</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">WidevineKeySource::set_signer</a>(std::unique_ptr&lt;RequestSigner&gt; signer) {</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  signer_ = std::move(signer);</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;}</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;</div>
+<div class="line"><a name="l00278"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">  278</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">WidevineKeySource::set_key_fetcher</a>(</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;    std::unique_ptr&lt;KeyFetcher&gt; key_fetcher) {</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;  key_fetcher_ = std::move(key_fetcher);</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;}</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> WidevineKeySource::GetKeyInternal(uint32_t crypto_period_index,</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;                                         TrackType track_type,</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;                                         <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  DCHECK(key_pool_);</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  DCHECK(key);</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;  DCHECK_LE(track_type, NUM_VALID_TRACK_TYPES);</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  DCHECK_NE(track_type, TRACK_TYPE_UNKNOWN);</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  scoped_refptr&lt;RefCountedEncryptionKeyMap&gt; ref_counted_encryption_key_map;</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status =</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;      key_pool_-&gt;Peek(crypto_period_index, &amp;ref_counted_encryption_key_map,</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;                      kGetKeyTimeoutInSeconds * 1000);</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;    <span class="keywordflow">if</span> (status.error_code() == error::STOPPED) {</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;      CHECK(!common_encryption_request_status_.ok());</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;      <span class="keywordflow">return</span> common_encryption_request_status_;</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    }</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;    <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  }</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  <span class="keyword">const</span> EncryptionKeyMap&amp; encryption_key_map =</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;      ref_counted_encryption_key_map-&gt;map();</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map.find(track_type) == encryption_key_map.end()) {</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR,</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;                  <span class="stringliteral">&quot;Cannot find key of type &quot;</span> + <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(track_type));</div>
 <div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  }</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  EncryptionKeyMap&amp; encryption_key_map = ref_counted_encryption_key_map-&gt;map();</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map.find(track_type) == encryption_key_map.end()) {</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR,</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;                  <span class="stringliteral">&quot;Cannot find key of type &quot;</span> + <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(track_type));</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  }</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  *key = *encryption_key_map[track_type];</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;}</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;  *key = *encryption_key_map.at(track_type);</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;}</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;<span class="keywordtype">void</span> WidevineKeySource::FetchKeysTask() {</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  <span class="comment">// Wait until key production is signaled.</span></div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  start_key_production_.Wait();</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  <span class="keywordflow">if</span> (!key_pool_ || key_pool_-&gt;Stopped())</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;    <span class="keywordflow">return</span>;</div>
 <div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;<span class="keywordtype">void</span> WidevineKeySource::FetchKeysTask() {</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  <span class="comment">// Wait until key production is signaled.</span></div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  start_key_production_.Wait();</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  <span class="keywordflow">if</span> (!key_pool_ || key_pool_-&gt;Stopped())</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  Status status = FetchKeysInternal(kEnableKeyRotation,</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;                                    first_crypto_period_index_,</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;                                    <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <span class="keywordflow">while</span> (status.ok()) {</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;    first_crypto_period_index_ += crypto_period_count_;</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;    status = FetchKeysInternal(kEnableKeyRotation,</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;                               first_crypto_period_index_,</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;                               <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  }</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  common_encryption_request_status_ = status;</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  key_pool_-&gt;Stop();</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;}</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;Status WidevineKeySource::FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;                                            uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;                                            <span class="keywordtype">bool</span> widevine_classic) {</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  std::string request;</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;  FillRequest(enable_key_rotation,</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;              first_crypto_period_index,</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;              &amp;request);</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  Status status = FetchKeysInternal(kEnableKeyRotation,</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                                    first_crypto_period_index_,</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                                    <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  <span class="keywordflow">while</span> (status.ok()) {</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;    first_crypto_period_index_ += crypto_period_count_;</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;    status = FetchKeysInternal(kEnableKeyRotation,</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;                               first_crypto_period_index_,</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;                               <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  }</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  common_encryption_request_status_ = status;</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  key_pool_-&gt;Stop();</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;}</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;Status WidevineKeySource::FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;                                            uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;                                            <span class="keywordtype">bool</span> widevine_classic) {</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  std::string request;</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  FillRequest(enable_key_rotation,</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;              first_crypto_period_index,</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;              &amp;request);</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  std::string message;</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  Status status = GenerateKeyMessage(request, &amp;message);</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;    <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Message: &quot;</span> &lt;&lt; message;</div>
 <div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  std::string message;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  Status status = GenerateKeyMessage(request, &amp;message);</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;    <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Message: &quot;</span> &lt;&lt; message;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  std::string raw_response;</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;  int64_t sleep_duration = kFirstRetryDelayMilliseconds;</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="comment">// Perform client side retries if seeing server transient error to workaround</span></div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="comment">// server limitation.</span></div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; kNumTransientErrorRetries; ++i) {</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;    status = key_fetcher_-&gt;FetchKeys(server_url_, message, &amp;raw_response);</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    <span class="keywordflow">if</span> (status.ok()) {</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;      VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Retry [&quot;</span> &lt;&lt; i &lt;&lt; <span class="stringliteral">&quot;] Response:&quot;</span> &lt;&lt; raw_response;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  std::string raw_response;</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  int64_t sleep_duration = kFirstRetryDelayMilliseconds;</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  <span class="comment">// Perform client side retries if seeing server transient error to workaround</span></div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  <span class="comment">// server limitation.</span></div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; kNumTransientErrorRetries; ++i) {</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    status = key_fetcher_-&gt;FetchKeys(server_url_, message, &amp;raw_response);</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;    <span class="keywordflow">if</span> (status.ok()) {</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;      VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Retry [&quot;</span> &lt;&lt; i &lt;&lt; <span class="stringliteral">&quot;] Response:&quot;</span> &lt;&lt; raw_response;</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;      std::string response;</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;      <span class="keywordflow">if</span> (!DecodeResponse(raw_response, &amp;response)) {</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;        <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;                      <span class="stringliteral">&quot;Failed to decode response &#39;&quot;</span> + raw_response + <span class="stringliteral">&quot;&#39;.&quot;</span>);</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;      }</div>
 <div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;      std::string response;</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;      <span class="keywordflow">if</span> (!DecodeResponse(raw_response, &amp;response)) {</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;        <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;                      <span class="stringliteral">&quot;Failed to decode response &#39;&quot;</span> + raw_response + <span class="stringliteral">&quot;&#39;.&quot;</span>);</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;      }</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      <span class="keywordtype">bool</span> transient_error = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      <span class="keywordflow">if</span> (ExtractEncryptionKey(enable_key_rotation,</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;                               widevine_classic,</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;                               response,</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;                               &amp;transient_error))</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;        <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;      <span class="keywordflow">if</span> (!transient_error) {</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;        <span class="keywordflow">return</span> Status(</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;            error::SERVER_ERROR,</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;            <span class="stringliteral">&quot;Failed to extract encryption key from &#39;&quot;</span> + response + <span class="stringliteral">&quot;&#39;.&quot;</span>);</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;      }</div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (status.error_code() != error::TIME_OUT) {</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;      <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;    }</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;    <span class="comment">// Exponential backoff.</span></div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;    <span class="keywordflow">if</span> (i != kNumTransientErrorRetries - 1) {</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;      base::PlatformThread::Sleep(</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;          base::TimeDelta::FromMilliseconds(sleep_duration));</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;      sleep_duration *= 2;</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;    }</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;  }</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;                <span class="stringliteral">&quot;Failed to recover from server internal error.&quot;</span>);</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;}</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;      <span class="keywordtype">bool</span> transient_error = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;      <span class="keywordflow">if</span> (ExtractEncryptionKey(enable_key_rotation,</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;                               widevine_classic,</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;                               response,</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;                               &amp;transient_error))</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;        <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      <span class="keywordflow">if</span> (!transient_error) {</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;        <span class="keywordflow">return</span> Status(</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;            error::SERVER_ERROR,</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;            <span class="stringliteral">&quot;Failed to extract encryption key from &#39;&quot;</span> + response + <span class="stringliteral">&quot;&#39;.&quot;</span>);</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;      }</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (status.error_code() != error::TIME_OUT) {</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;      <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;    }</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;</div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    <span class="comment">// Exponential backoff.</span></div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    <span class="keywordflow">if</span> (i != kNumTransientErrorRetries - 1) {</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;      base::PlatformThread::Sleep(</div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;          base::TimeDelta::FromMilliseconds(sleep_duration));</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;      sleep_duration *= 2;</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    }</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;  }</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;  <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;                <span class="stringliteral">&quot;Failed to recover from server internal error.&quot;</span>);</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;}</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;<span class="keywordtype">void</span> WidevineKeySource::FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;                                    uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;                                    std::string* request) {</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  DCHECK(request);</div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  DCHECK(!request_dict_.empty());</div>
 <div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;<span class="keywordtype">void</span> WidevineKeySource::FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;                                    uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;                                    std::string* request) {</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  DCHECK(request);</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  DCHECK(!request_dict_.empty());</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  <span class="comment">// Build tracks.</span></div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  base::ListValue* tracks = <span class="keyword">new</span> base::ListValue();</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  base::DictionaryValue* track_sd = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  track_sd-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;SD&quot;</span>);</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  tracks-&gt;Append(track_sd);</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;  base::DictionaryValue* track_hd = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  track_hd-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;HD&quot;</span>);</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  tracks-&gt;Append(track_hd);</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  base::DictionaryValue* track_audio = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  track_audio-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;AUDIO&quot;</span>);</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  tracks-&gt;Append(track_audio);</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;tracks&quot;</span>, tracks);</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  <span class="comment">// Build DRM types.</span></div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  base::ListValue* drm_types = <span class="keyword">new</span> base::ListValue();</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  drm_types-&gt;AppendString(<span class="stringliteral">&quot;WIDEVINE&quot;</span>);</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;drm_types&quot;</span>, drm_types);</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  <span class="comment">// Build key rotation fields.</span></div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  <span class="keywordflow">if</span> (enable_key_rotation) {</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;    <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;    <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;    request_dict_.SetDouble(<span class="stringliteral">&quot;first_crypto_period_index&quot;</span>,</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;                            first_crypto_period_index);</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;    request_dict_.SetInteger(<span class="stringliteral">&quot;crypto_period_count&quot;</span>, crypto_period_count_);</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;  }</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  base::JSONWriter::WriteWithOptions(</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;      request_dict_,</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;      <span class="comment">// Write doubles that have no fractional part as a normal integer, i.e.</span></div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;      <span class="comment">// without using exponential notation or appending a &#39;.0&#39;.</span></div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;      base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, request);</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;}</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;Status WidevineKeySource::GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request,</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;                                             std::string* message) {</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  DCHECK(message);</div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="comment">// Build tracks.</span></div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  base::ListValue* tracks = <span class="keyword">new</span> base::ListValue();</div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  base::DictionaryValue* track_sd = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  track_sd-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;SD&quot;</span>);</div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  tracks-&gt;Append(track_sd);</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  base::DictionaryValue* track_hd = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  track_hd-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;HD&quot;</span>);</div>
+<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;  tracks-&gt;Append(track_hd);</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  base::DictionaryValue* track_audio = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  track_audio-&gt;SetString(<span class="stringliteral">&quot;type&quot;</span>, <span class="stringliteral">&quot;AUDIO&quot;</span>);</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  tracks-&gt;Append(track_audio);</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;tracks&quot;</span>, tracks);</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  <span class="comment">// Build DRM types.</span></div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  base::ListValue* drm_types = <span class="keyword">new</span> base::ListValue();</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  drm_types-&gt;AppendString(<span class="stringliteral">&quot;WIDEVINE&quot;</span>);</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;drm_types&quot;</span>, drm_types);</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  <span class="comment">// Build key rotation fields.</span></div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  <span class="keywordflow">if</span> (enable_key_rotation) {</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;    <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;    <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;    request_dict_.SetDouble(<span class="stringliteral">&quot;first_crypto_period_index&quot;</span>,</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;                            first_crypto_period_index);</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;    request_dict_.SetInteger(<span class="stringliteral">&quot;crypto_period_count&quot;</span>, crypto_period_count_);</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  }</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  base::JSONWriter::WriteWithOptions(</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;      request_dict_,</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;      <span class="comment">// Write doubles that have no fractional part as a normal integer, i.e.</span></div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;      <span class="comment">// without using exponential notation or appending a &#39;.0&#39;.</span></div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;      base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, request);</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;}</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;Status WidevineKeySource::GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request,</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;                                             std::string* message) {</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  DCHECK(message);</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;  std::string request_base64_string;</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  base::Base64Encode(request, &amp;request_base64_string);</div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  base::DictionaryValue request_dict;</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  request_dict.SetString(<span class="stringliteral">&quot;request&quot;</span>, request_base64_string);</div>
 <div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;</div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  std::string request_base64_string;</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  base::Base64Encode(request, &amp;request_base64_string);</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;</div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;  base::DictionaryValue request_dict;</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;  request_dict.SetString(<span class="stringliteral">&quot;request&quot;</span>, request_base64_string);</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  <span class="comment">// Sign the request.</span></div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  <span class="keywordflow">if</span> (signer_) {</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;    std::string signature;</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;    <span class="keywordflow">if</span> (!signer_-&gt;GenerateSignature(request, &amp;signature))</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;      <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Signature generation failed.&quot;</span>);</div>
 <div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;  <span class="comment">// Sign the request.</span></div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;  <span class="keywordflow">if</span> (signer_) {</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;    std::string signature;</div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;    <span class="keywordflow">if</span> (!signer_-&gt;GenerateSignature(request, &amp;signature))</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;      <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Signature generation failed.&quot;</span>);</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;    std::string signature_base64_string;</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;    base::Base64Encode(signature, &amp;signature_base64_string);</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;</div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signature&quot;</span>, signature_base64_string);</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signer&quot;</span>, signer_-&gt;signer_name());</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  }</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  base::JSONWriter::Write(request_dict, message);</div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;}</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;</div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::DecodeResponse(</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;    <span class="keyword">const</span> std::string&amp; raw_response,</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;    std::string* response) {</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  DCHECK(response);</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  <span class="comment">// Extract base64 formatted response from JSON formatted raw response.</span></div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;  <span class="comment">// TODO(kqyang): Remove &quot;.release()&quot; when base is updated to use unique_ptr.</span></div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;      base::JSONReader::Read(raw_response).release());</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;&quot;</span> &lt;&lt; raw_response &lt;&lt; <span class="stringliteral">&quot;&#39; is not in JSON format.&quot;</span>;</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;  }</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* response_dict = NULL;</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;response_dict));</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;    std::string signature_base64_string;</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;    base::Base64Encode(signature, &amp;signature_base64_string);</div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signature&quot;</span>, signature_base64_string);</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signer&quot;</span>, signer_-&gt;signer_name());</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;  }</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;</div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;  base::JSONWriter::Write(request_dict, message);</div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;}</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::DecodeResponse(</div>
+<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;    <span class="keyword">const</span> std::string&amp; raw_response,</div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;    std::string* response) {</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  DCHECK(response);</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;</div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  <span class="comment">// Extract base64 formatted response from JSON formatted raw response.</span></div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;  <span class="comment">// TODO(kqyang): Remove &quot;.release()&quot; when base is updated to use unique_ptr.</span></div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;      base::JSONReader::Read(raw_response).release());</div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;&quot;</span> &lt;&lt; raw_response &lt;&lt; <span class="stringliteral">&quot;&#39; is not in JSON format.&quot;</span>;</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;  }</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* response_dict = NULL;</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;response_dict));</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;</div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;  std::string response_base64_string;</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  RCHECK(response_dict-&gt;GetString(<span class="stringliteral">&quot;response&quot;</span>, &amp;response_base64_string));</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;  RCHECK(base::Base64Decode(response_base64_string, response));</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;}</div>
 <div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;  std::string response_base64_string;</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;  RCHECK(response_dict-&gt;GetString(<span class="stringliteral">&quot;response&quot;</span>, &amp;response_base64_string));</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  RCHECK(base::Base64Decode(response_base64_string, response));</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;}</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::ExtractEncryptionKey(</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;    <span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;    <span class="keywordtype">bool</span> widevine_classic,</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;    <span class="keyword">const</span> std::string&amp; response,</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;    <span class="keywordtype">bool</span>* transient_error) {</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  DCHECK(transient_error);</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;  *transient_error = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;</div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;  <span class="comment">// TODO(kqyang): Remove &quot;.release()&quot; when base is updated to use unique_ptr.</span></div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(base::JSONReader::Read(response).release());</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;&quot;</span> &lt;&lt; response &lt;&lt; <span class="stringliteral">&quot;&#39; is not in JSON format.&quot;</span>;</div>
-<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;  }</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* license_dict = NULL;</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;license_dict));</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;  std::string license_status;</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  RCHECK(license_dict-&gt;GetString(<span class="stringliteral">&quot;status&quot;</span>, &amp;license_status));</div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;  <span class="keywordflow">if</span> (license_status != kLicenseStatusOK) {</div>
-<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Received non-OK license response: &quot;</span> &lt;&lt; response;</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;    *transient_error = (license_status == kLicenseStatusTransientError);</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;  }</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::ExtractEncryptionKey(</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;    <span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;    <span class="keywordtype">bool</span> widevine_classic,</div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;    <span class="keyword">const</span> std::string&amp; response,</div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;    <span class="keywordtype">bool</span>* transient_error) {</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  DCHECK(transient_error);</div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;  *transient_error = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;</div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  <span class="comment">// TODO(kqyang): Remove &quot;.release()&quot; when base is updated to use unique_ptr.</span></div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(base::JSONReader::Read(response).release());</div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;&quot;</span> &lt;&lt; response &lt;&lt; <span class="stringliteral">&quot;&#39; is not in JSON format.&quot;</span>;</div>
+<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;  }</div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;</div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* license_dict = NULL;</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;license_dict));</div>
+<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;</div>
+<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;  std::string license_status;</div>
+<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;  RCHECK(license_dict-&gt;GetString(<span class="stringliteral">&quot;status&quot;</span>, &amp;license_status));</div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  <span class="keywordflow">if</span> (license_status != kLicenseStatusOK) {</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Received non-OK license response: &quot;</span> &lt;&lt; response;</div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;    *transient_error = (license_status == kLicenseStatusTransientError);</div>
+<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;  }</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;  <span class="keyword">const</span> base::ListValue* tracks;</div>
+<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;  RCHECK(license_dict-&gt;GetList(<span class="stringliteral">&quot;tracks&quot;</span>, &amp;tracks));</div>
+<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  <span class="comment">// Should have at least one track per crypto_period.</span></div>
+<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  RCHECK(enable_key_rotation ? tracks-&gt;GetSize() &gt;= 1 * crypto_period_count_</div>
+<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;                             : tracks-&gt;GetSize() &gt;= 1);</div>
 <div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;</div>
-<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  <span class="keyword">const</span> base::ListValue* tracks;</div>
-<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;  RCHECK(license_dict-&gt;GetList(<span class="stringliteral">&quot;tracks&quot;</span>, &amp;tracks));</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  <span class="comment">// Should have at least one track per crypto_period.</span></div>
-<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;  RCHECK(enable_key_rotation ? tracks-&gt;GetSize() &gt;= 1 * crypto_period_count_</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;                             : tracks-&gt;GetSize() &gt;= 1);</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  <span class="keywordtype">int</span> current_crypto_period_index = first_crypto_period_index_;</div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;  EncryptionKeyMap encryption_key_map;</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; tracks-&gt;GetSize(); ++i) {</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;    <span class="keyword">const</span> base::DictionaryValue* track_dict;</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;    RCHECK(tracks-&gt;GetDictionary(i, &amp;track_dict));</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;    <span class="keywordflow">if</span> (enable_key_rotation) {</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;      <span class="keywordtype">int</span> crypto_period_index;</div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;      RCHECK(</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;          track_dict-&gt;GetInteger(<span class="stringliteral">&quot;crypto_period_index&quot;</span>, &amp;crypto_period_index));</div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;      <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index) {</div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;        <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index + 1) {</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting crypto period index &quot;</span></div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;                     &lt;&lt; current_crypto_period_index &lt;&lt; <span class="stringliteral">&quot; or &quot;</span></div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;                     &lt;&lt; current_crypto_period_index + 1 &lt;&lt; <span class="stringliteral">&quot;; Seen &quot;</span></div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;                     &lt;&lt; crypto_period_index &lt;&lt; <span class="stringliteral">&quot; at track &quot;</span> &lt;&lt; i;</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;        }</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;        <span class="keywordflow">if</span> (!PushToKeyPool(&amp;encryption_key_map))</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;        ++current_crypto_period_index;</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;      }</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;    }</div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  <span class="keywordtype">int</span> current_crypto_period_index = first_crypto_period_index_;</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;</div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  EncryptionKeyMap encryption_key_map;</div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; tracks-&gt;GetSize(); ++i) {</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;    <span class="keyword">const</span> base::DictionaryValue* track_dict;</div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;    RCHECK(tracks-&gt;GetDictionary(i, &amp;track_dict));</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;</div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;    <span class="keywordflow">if</span> (enable_key_rotation) {</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;      <span class="keywordtype">int</span> crypto_period_index;</div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;      RCHECK(</div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;          track_dict-&gt;GetInteger(<span class="stringliteral">&quot;crypto_period_index&quot;</span>, &amp;crypto_period_index));</div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;      <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index) {</div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;        <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index + 1) {</div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting crypto period index &quot;</span></div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;                     &lt;&lt; current_crypto_period_index &lt;&lt; <span class="stringliteral">&quot; or &quot;</span></div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;                     &lt;&lt; current_crypto_period_index + 1 &lt;&lt; <span class="stringliteral">&quot;; Seen &quot;</span></div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;                     &lt;&lt; crypto_period_index &lt;&lt; <span class="stringliteral">&quot; at track &quot;</span> &lt;&lt; i;</div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;        }</div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;        <span class="keywordflow">if</span> (!PushToKeyPool(&amp;encryption_key_map))</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;        ++current_crypto_period_index;</div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;      }</div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;    }</div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;</div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;    std::string track_type_str;</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;    RCHECK(track_dict-&gt;GetString(<span class="stringliteral">&quot;type&quot;</span>, &amp;track_type_str));</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;    TrackType track_type = <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">GetTrackTypeFromString</a>(track_type_str);</div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;    DCHECK_NE(TRACK_TYPE_UNKNOWN, track_type);</div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;    RCHECK(encryption_key_map.find(track_type) == encryption_key_map.end());</div>
 <div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;</div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    std::string track_type_str;</div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;    RCHECK(track_dict-&gt;GetString(<span class="stringliteral">&quot;type&quot;</span>, &amp;track_type_str));</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;    TrackType track_type = <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">GetTrackTypeFromString</a>(track_type_str);</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;    DCHECK_NE(TRACK_TYPE_UNKNOWN, track_type);</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;    RCHECK(encryption_key_map.find(track_type) == encryption_key_map.end());</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> EncryptionKey());</div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;    <span class="keywordflow">if</span> (!GetKeyFromTrack(*track_dict, &amp;encryption_key-&gt;key))</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;</div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;    <span class="comment">// Get key ID and PSSH data for CENC content only.</span></div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;    <span class="keywordflow">if</span> (!widevine_classic) {</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;      <span class="keywordflow">if</span> (!GetKeyIdFromTrack(*track_dict, &amp;encryption_key-&gt;key_id))</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;      ProtectionSystemSpecificInfo info;</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;      info.add_key_id(encryption_key-&gt;key_id);</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;      info.set_system_id(kWidevineSystemId, arraysize(kWidevineSystemId));</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;      info.set_pssh_box_version(0);</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;      std::vector&lt;uint8_t&gt; pssh_data;</div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;      <span class="keywordflow">if</span> (!GetPsshDataFromTrack(*track_dict, &amp;pssh_data))</div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;      info.set_pssh_data(pssh_data);</div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;      encryption_key-&gt;key_system_info.push_back(info);</div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;    }</div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;    encryption_key_map[track_type] = encryption_key.release();</div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;  }</div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;</div>
-<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;  <span class="comment">// If the flag exists, create a common system ID PSSH box that contains the</span></div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;  <span class="comment">// key IDs of all the keys.</span></div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  <span class="keywordflow">if</span> (add_common_pssh_ &amp;&amp; !widevine_classic) {</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    std::set&lt;std::vector&lt;uint8_t&gt;&gt; key_ids;</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;      key_ids.insert(pair.second-&gt;key_id);</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;    }</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;</div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;    <span class="comment">// Create a common system PSSH box.</span></div>
-<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;    ProtectionSystemSpecificInfo info;</div>
-<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;    info.set_system_id(kCommonSystemId, arraysize(kCommonSystemId));</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;    info.set_pssh_box_version(1);</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id : key_ids) {</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;      info.add_key_id(key_id);</div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;    }</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;      pair.second-&gt;key_system_info.push_back(info);</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;    }</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> EncryptionKey());</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;    <span class="keywordflow">if</span> (!GetKeyFromTrack(*track_dict, &amp;encryption_key-&gt;key))</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;    <span class="comment">// Get key ID and PSSH data for CENC content only.</span></div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;    <span class="keywordflow">if</span> (!widevine_classic) {</div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;      <span class="keywordflow">if</span> (!GetKeyIdFromTrack(*track_dict, &amp;encryption_key-&gt;key_id))</div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;      ProtectionSystemSpecificInfo info;</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;      info.add_key_id(encryption_key-&gt;key_id);</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;      info.set_system_id(kWidevineSystemId, arraysize(kWidevineSystemId));</div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;      info.set_pssh_box_version(0);</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;</div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;      std::vector&lt;uint8_t&gt; pssh_data;</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;      <span class="keywordflow">if</span> (!GetPsshDataFromTrack(*track_dict, &amp;pssh_data))</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;      info.set_pssh_data(pssh_data);</div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;</div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;      encryption_key-&gt;key_system_info.push_back(info);</div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;    }</div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;    encryption_key_map[track_type] = std::move(encryption_key);</div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;  }</div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;  <span class="comment">// If the flag exists, create a common system ID PSSH box that contains the</span></div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  <span class="comment">// key IDs of all the keys.</span></div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;  <span class="keywordflow">if</span> (add_common_pssh_ &amp;&amp; !widevine_classic) {</div>
+<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;    std::set&lt;std::vector&lt;uint8_t&gt;&gt; key_ids;</div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;      key_ids.insert(pair.second-&gt;key_id);</div>
+<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;    }</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;    <span class="comment">// Create a common system PSSH box.</span></div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    ProtectionSystemSpecificInfo info;</div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;    info.set_system_id(kCommonSystemId, arraysize(kCommonSystemId));</div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;    info.set_pssh_box_version(1);</div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id : key_ids) {</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;      info.add_key_id(key_id);</div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;    }</div>
+<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;</div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;      pair.second-&gt;key_system_info.push_back(info);</div>
+<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;    }</div>
+<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;  }</div>
+<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;</div>
+<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  DCHECK(!encryption_key_map.empty());</div>
+<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  <span class="keywordflow">if</span> (!enable_key_rotation) {</div>
+<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;    encryption_key_map_.swap(encryption_key_map);</div>
+<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
 <div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;  }</div>
-<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;</div>
-<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  DCHECK(!encryption_key_map.empty());</div>
-<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;  <span class="keywordflow">if</span> (!enable_key_rotation) {</div>
-<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;    encryption_key_map_ = encryption_key_map;</div>
-<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  }</div>
-<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;  <span class="keywordflow">return</span> PushToKeyPool(&amp;encryption_key_map);</div>
-<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;}</div>
-<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;</div>
-<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::PushToKeyPool(</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;    EncryptionKeyMap* encryption_key_map) {</div>
-<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  DCHECK(key_pool_);</div>
-<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  DCHECK(encryption_key_map);</div>
-<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  Status status =</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;      key_pool_-&gt;Push(scoped_refptr&lt;RefCountedEncryptionKeyMap&gt;(</div>
-<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;                          <span class="keyword">new</span> RefCountedEncryptionKeyMap(encryption_key_map)),</div>
-<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;                      kInfiniteTimeout);</div>
-<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;  encryption_key_map-&gt;clear();</div>
-<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;    DCHECK_EQ(error::STOPPED, status.error_code());</div>
-<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;  }</div>
-<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;}</div>
-<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;</div>
-<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;  <span class="keywordflow">return</span> PushToKeyPool(&amp;encryption_key_map);</div>
+<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;}</div>
+<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;</div>
+<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::PushToKeyPool(</div>
+<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;    EncryptionKeyMap* encryption_key_map) {</div>
+<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  DCHECK(key_pool_);</div>
+<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;  DCHECK(encryption_key_map);</div>
+<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  Status status =</div>
+<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;      key_pool_-&gt;Push(scoped_refptr&lt;RefCountedEncryptionKeyMap&gt;(</div>
+<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;                          <span class="keyword">new</span> RefCountedEncryptionKeyMap(encryption_key_map)),</div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;                      kInfiniteTimeout);</div>
+<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  encryption_key_map-&gt;clear();</div>
+<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;    DCHECK_EQ(error::STOPPED, status.error_code());</div>
+<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;  }</div>
+<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;}</div>
+<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;</div>
+<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1HttpKeyFetcher_html"><div class="ttname"><a href="../../d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html">shaka::media::HttpKeyFetcher</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d71/http__key__fetcher_8h_source.html#l00026">http_key_fetcher.h:26</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ae6490d21a6538b9c909fdf996398e576"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">shaka::media::WidevineKeySource::FetchKeys</a></div><div class="ttdeci">Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00176">widevine_key_source.cc:176</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ab56a71e9f9f9e545f96e667279c05bb1"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">shaka::media::WidevineKeySource::GetCryptoPeriodKey</a></div><div class="ttdeci">Status GetCryptoPeriodKey(uint32_t crypto_period_index, TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00259">widevine_key_source.cc:259</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a59a16d61c6a6d05745e8b49fd3618deb"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">shaka::media::WidevineKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00233">widevine_key_source.cc:233</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ae6490d21a6538b9c909fdf996398e576"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">shaka::media::WidevineKeySource::FetchKeys</a></div><div class="ttdeci">Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00172">widevine_key_source.cc:172</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ab56a71e9f9f9e545f96e667279c05bb1"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">shaka::media::WidevineKeySource::GetCryptoPeriodKey</a></div><div class="ttdeci">Status GetCryptoPeriodKey(uint32_t crypto_period_index, TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00252">widevine_key_source.cc:252</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a59a16d61c6a6d05745e8b49fd3618deb"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">shaka::media::WidevineKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00229">widevine_key_source.cc:229</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_a4f9cede7a8c1678e1fac93c8fe12aa75"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">shaka::media::KeySource::TrackTypeToString</a></div><div class="ttdeci">static std::string TrackTypeToString(TrackType track_type)</div><div class="ttdoc">Convert TrackType to string. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd6/key__source_8cc_source.html#l00033">key_source.cc:33</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProducerConsumerQueue_html"><div class="ttname"><a href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">shaka::media::ProducerConsumerQueue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d15/producer__consumer__queue_8h_source.html#l00028">producer_consumer_queue.h:28</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d5c/widevine__key__source_8h_source.html#l00030">widevine_key_source.h:30</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_a0963412e7ee33d0e34893ebdf38d96c1"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">shaka::media::KeySource::GetTrackTypeFromString</a></div><div class="ttdeci">static TrackType GetTrackTypeFromString(const std::string &amp;track_type_string)</div><div class="ttdoc">Convert string representation of track type to enum representation. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd6/key__source_8cc_source.html#l00019">key_source.cc:19</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProtectionSystemSpecificInfo_html"><div class="ttname"><a href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html">shaka::media::ProtectionSystemSpecificInfo</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d59/protection__system__specific__info_8h_source.html#l00019">protection_system_specific_info.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a97c0565df9381e178ebb50c193cebd04"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(std::unique_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00285">widevine_key_source.cc:285</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a93480a98e423d0456482844ac629bd2e"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">shaka::media::WidevineKeySource::WidevineKeySource</a></div><div class="ttdeci">WidevineKeySource(const std::string &amp;server_url, bool add_common_pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00137">widevine_key_source.cc:137</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a97c0565df9381e178ebb50c193cebd04"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(std::unique_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00278">widevine_key_source.cc:278</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a93480a98e423d0456482844ac629bd2e"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">shaka::media::WidevineKeySource::WidevineKeySource</a></div><div class="ttdeci">WidevineKeySource(const std::string &amp;server_url, bool add_common_pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00134">widevine_key_source.cc:134</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a48d182da15ecc85e2ae7fd164ba0a526"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(std::unique_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00281">widevine_key_source.cc:281</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a48d182da15ecc85e2ae7fd164ba0a526"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(std::unique_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00274">widevine_key_source.cc:274</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProtectionSystemSpecificInfo_html_a13b0f93b68efff614c5356df081f2560"><div class="ttname"><a href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#a13b0f93b68efff614c5356df081f2560">shaka::media::ProtectionSystemSpecificInfo::Parse</a></div><div class="ttdeci">bool Parse(const uint8_t *data, size_t data_size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d42/protection__system__specific__info_8cc_source.html#l00044">protection_system_specific_info.cc:44</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d8c/structshaka_1_1media_1_1mp4_1_1CompositionOffset.html b/docs/d5/d8c/structshaka_1_1media_1_1mp4_1_1CompositionOffset.html
index 448204c2bc..72ce63de3f 100644
--- a/docs/d5/d8c/structshaka_1_1media_1_1mp4_1_1CompositionOffset.html
+++ b/docs/d5/d8c/structshaka_1_1media_1_1mp4_1_1CompositionOffset.html
@@ -112,7 +112,7 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>sample_offset</b><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d8f/webm__cluster__parser_8cc_source.html b/docs/d5/d8f/webm__cluster__parser_8cc_source.html
index 13fe56a45c..dbaf3ea217 100644
--- a/docs/d5/d8f/webm__cluster__parser_8cc_source.html
+++ b/docs/d5/d8f/webm__cluster__parser_8cc_source.html
@@ -716,13 +716,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1MediaSample_html_a3fac8e4cc8da3b34ef5f698411ec868b"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">shaka::media::MediaSample::CopyFrom</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CopyFrom(const uint8_t *data, size_t size, bool is_key_frame)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00045">media_sample.cc:45</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMClusterParser_html_a8a7c7e7ac6a5da1cd45ab50f914f6826"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#a8a7c7e7ac6a5da1cd45ab50f914f6826">shaka::media::WebMClusterParser::WebMClusterParser</a></div><div class="ttdeci">WebMClusterParser(int64_t timecode_scale, scoped_refptr&lt; AudioStreamInfo &gt; audio_stream_info, scoped_refptr&lt; VideoStreamInfo &gt; video_stream_info, int64_t audio_default_duration, int64_t video_default_duration, const WebMTracksParser::TextTracks &amp;text_tracks, const std::set&lt; int64_t &gt; &amp;ignored_tracks, const std::string &amp;audio_encryption_key_id, const std::string &amp;video_encryption_key_id, const MediaParser::NewSampleCB &amp;new_sample_cb, const MediaParser::InitCB &amp;init_cb, KeySource *decryption_key_source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00029">webm_cluster_parser.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMListParser_html_acf786fc2e07143c3f1a481401240d105"><div class="ttname"><a href="../../dc/dca/classshaka_1_1media_1_1WebMListParser.html#acf786fc2e07143c3f1a481401240d105">shaka::media::WebMListParser::IsParsingComplete</a></div><div class="ttdeci">bool IsParsingComplete() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/db6/webm__parser_8cc_source.html#l00803">webm_parser.cc:803</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00021">decryptor_source.h:21</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00022">decryptor_source.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMParserClient_html"><div class="ttname"><a href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">shaka::media::WebMParserClient</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d46/webm__parser_8h_source.html#l00030">webm_parser.h:30</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMClusterParser_html_abb306c3299a7279125b8f321ef5bbc94"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#abb306c3299a7279125b8f321ef5bbc94">shaka::media::WebMClusterParser::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Resets the parser state so it can accept a new cluster. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00072">webm_cluster_parser.cc:72</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d91/es__parser__adts_8cc_source.html b/docs/d5/d91/es__parser__adts_8cc_source.html
index 5ff7597db4..479e668bd0 100644
--- a/docs/d5/d91/es__parser__adts_8cc_source.html
+++ b/docs/d5/d91/es__parser__adts_8cc_source.html
@@ -367,7 +367,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d95/structshaka_1_1media_1_1mp4_1_1EditListEntry-members.html b/docs/d5/d95/structshaka_1_1media_1_1mp4_1_1EditListEntry-members.html
index 379295575b..f2f2397ace 100644
--- a/docs/d5/d95/structshaka_1_1media_1_1mp4_1_1EditListEntry-members.html
+++ b/docs/d5/d95/structshaka_1_1media_1_1mp4_1_1EditListEntry-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d98/encryptor_8cc_source.html b/docs/d5/d98/encryptor_8cc_source.html
index 19b2881e1e..3543ce23f8 100644
--- a/docs/d5/d98/encryptor_8cc_source.html
+++ b/docs/d5/d98/encryptor_8cc_source.html
@@ -307,7 +307,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1BufferWriter_html_ab3054a98a4ec27764c65511dc17a916d"><div class="ttname"><a href="../../dc/d41/classshaka_1_1media_1_1BufferWriter.html#ab3054a98a4ec27764c65511dc17a916d">shaka::media::BufferWriter::Buffer</a></div><div class="ttdeci">const uint8_t * Buffer() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/dd2/buffer__writer_8h_source.html#l00059">buffer_writer.h:59</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Encryptor_html_afa6065049fad093b96643b9e3d70595f"><div class="ttname"><a href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f">shaka::media::webm::Encryptor::Initialize</a></div><div class="ttdeci">Status Initialize(MuxerListener *muxer_listener, KeySource::TrackType track_type, Codec codec, KeySource *key_source, bool webm_subsample_encryption)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d98/encryptor_8cc_source.html#l00061">encryptor.cc:61</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VP9Parser_html"><div class="ttname"><a href="../../db/d5a/classshaka_1_1media_1_1VP9Parser.html">shaka::media::VP9Parser</a></div><div class="ttdoc">Class to parse a vp9 bit stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d8a/vp9__parser_8h_source.html#l00020">vp9_parser.h:20</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCtrEncryptor_html"><div class="ttname"><a href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">shaka::media::AesCtrEncryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/df0/aes__encryptor_8h_source.html#l00042">aes_encryptor.h:42</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Encryptor_html_a3bfe9e0d99652811cb785832529f3d3c"><div class="ttname"><a href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c">shaka::media::webm::Encryptor::EncryptFrame</a></div><div class="ttdeci">Status EncryptFrame(scoped_refptr&lt; MediaSample &gt; sample, bool encrypt_frame)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d98/encryptor_8cc_source.html#l00076">encryptor.cc:76</a></div></div>
@@ -317,7 +317,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d9b/vp__codec__configuration__record_8h_source.html b/docs/d5/d9b/vp__codec__configuration__record_8h_source.html
index 085672ba1e..9d3f54bcf6 100644
--- a/docs/d5/d9b/vp__codec__configuration__record_8h_source.html
+++ b/docs/d5/d9b/vp__codec__configuration__record_8h_source.html
@@ -224,7 +224,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/d9d/structshaka_1_1media_1_1H265ReferencePictureListModifications.html b/docs/d5/d9d/structshaka_1_1media_1_1H265ReferencePictureListModifications.html
index 582ad498fe..0de9385f0e 100644
--- a/docs/d5/d9d/structshaka_1_1media_1_1H265ReferencePictureListModifications.html
+++ b/docs/d5/d9d/structshaka_1_1media_1_1H265ReferencePictureListModifications.html
@@ -119,7 +119,7 @@ std::vector&lt; int &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>l
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/da4/aes__encryptor_8cc_source.html b/docs/d5/da4/aes__encryptor_8cc_source.html
index 0f5382b96a..f2f569649b 100644
--- a/docs/d5/da4/aes__encryptor_8cc_source.html
+++ b/docs/d5/da4/aes__encryptor_8cc_source.html
@@ -292,12 +292,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1AesEncryptor_html_a873b0794baca91b36dbc484fc9c37e58"><div class="ttname"><a href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58">shaka::media::AesEncryptor::AesEncryptor</a></div><div class="ttdeci">AesEncryptor(ConstantIvFlag constant_iv_flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/da4/aes__encryptor_8cc_source.html#l00035">aes_encryptor.cc:35</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCbcEncryptor_html"><div class="ttname"><a href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">shaka::media::AesCbcEncryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/df0/aes__encryptor_8h_source.html#l00077">aes_encryptor.h:77</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">aes_cryptor.cc:69</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">aes_cryptor.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesEncryptor_html"><div class="ttname"><a href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">shaka::media::AesEncryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/df0/aes__encryptor_8h_source.html#l00021">aes_encryptor.h:21</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dad/structshaka_1_1media_1_1H265ReferencePictureSet.html b/docs/d5/dad/structshaka_1_1media_1_1H265ReferencePictureSet.html
index 1fa81308cc..7850dfca73 100644
--- a/docs/d5/dad/structshaka_1_1media_1_1H265ReferencePictureSet.html
+++ b/docs/d5/dad/structshaka_1_1media_1_1H265ReferencePictureSet.html
@@ -127,7 +127,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>num_delta_pocs</b></td
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/db1/classshaka_1_1media_1_1StreamInfo.html b/docs/d5/db1/classshaka_1_1media_1_1StreamInfo.html
index aa1a2d2432..7c0992eb55 100644
--- a/docs/d5/db1/classshaka_1_1media_1_1StreamInfo.html
+++ b/docs/d5/db1/classshaka_1_1media_1_1StreamInfo.html
@@ -235,7 +235,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>base::RefCountedThre
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html b/docs/d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html
index 2e27a14b4e..b0974a3a9b 100644
--- a/docs/d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html
+++ b/docs/d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html
@@ -161,7 +161,7 @@ const <br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dba/ts__packet_8cc_source.html b/docs/d5/dba/ts__packet_8cc_source.html
index 4bced689b6..1dfcbc2be5 100644
--- a/docs/d5/dba/ts__packet_8cc_source.html
+++ b/docs/d5/dba/ts__packet_8cc_source.html
@@ -304,7 +304,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dc1/webm__webvtt__parser_8cc_source.html b/docs/d5/dc1/webm__webvtt__parser_8cc_source.html
index 9838eee10c..83ce4abc8b 100644
--- a/docs/d5/dc1/webm__webvtt__parser_8cc_source.html
+++ b/docs/d5/dc1/webm__webvtt__parser_8cc_source.html
@@ -171,7 +171,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dc8/structshaka_1_1media_1_1mp4_1_1TrackFragment-members.html b/docs/d5/dc8/structshaka_1_1media_1_1mp4_1_1TrackFragment-members.html
index 173bce0a79..8305c6dc7b 100644
--- a/docs/d5/dc8/structshaka_1_1media_1_1mp4_1_1TrackFragment-members.html
+++ b/docs/d5/dc8/structshaka_1_1media_1_1mp4_1_1TrackFragment-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dca/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset.html b/docs/d5/dca/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset.html
index 77e17e09dd..a7ad434e66 100644
--- a/docs/d5/dca/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset.html
+++ b/docs/d5/dca/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationOffset.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dcf/rsa__key_8h_source.html b/docs/d5/dcf/rsa__key_8h_source.html
index 191ac4ba5d..d0dca4edfc 100644
--- a/docs/d5/dcf/rsa__key_8h_source.html
+++ b/docs/d5/dcf/rsa__key_8h_source.html
@@ -155,17 +155,17 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
 <div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_RSA_KEY_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">shaka::media::RsaPublicKey</a></div><div class="ttdoc">Rsa public key, used for signature verification and encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dcf/rsa__key_8h_source.html#l00053">rsa_key.h:53</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_ab9dcf591f3235b8f4eaa02886f9845e3"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">shaka::media::RsaPublicKey::Encrypt</a></div><div class="ttdeci">bool Encrypt(const std::string &amp;clear_message, std::string *encrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00185">rsa_key.cc:185</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_a89a475ffe2d96bfab09536b864038ca4"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">shaka::media::RsaPrivateKey::Decrypt</a></div><div class="ttdeci">bool Decrypt(const std::string &amp;encrypted_message, std::string *decrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00102">rsa_key.cc:102</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_ab9dcf591f3235b8f4eaa02886f9845e3"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">shaka::media::RsaPublicKey::Encrypt</a></div><div class="ttdeci">bool Encrypt(const std::string &amp;clear_message, std::string *encrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00176">rsa_key.cc:176</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_a89a475ffe2d96bfab09536b864038ca4"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">shaka::media::RsaPrivateKey::Decrypt</a></div><div class="ttdeci">bool Decrypt(const std::string &amp;encrypted_message, std::string *decrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00101">rsa_key.cc:101</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">shaka::media::RsaPrivateKey</a></div><div class="ttdoc">Rsa private key, used for message signing and decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dcf/rsa__key_8h_source.html#l00024">rsa_key.h:24</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_a146cc97c8fcacadde1b08c373b766fe4"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">shaka::media::RsaPublicKey::VerifySignature</a></div><div class="ttdeci">bool VerifySignature(const std::string &amp;message, const std::string &amp;signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00210">rsa_key.cc:210</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_aabe4a2f1541ca1e741305f58329e3881"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey::Create</a></div><div class="ttdeci">static RsaPublicKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00180">rsa_key.cc:180</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_ad05d8951dfe3a8af754490022e95e5f2"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">shaka::media::RsaPrivateKey::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00130">rsa_key.cc:130</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00097">rsa_key.cc:97</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_a146cc97c8fcacadde1b08c373b766fe4"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">shaka::media::RsaPublicKey::VerifySignature</a></div><div class="ttdeci">bool VerifySignature(const std::string &amp;message, const std::string &amp;signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00200">rsa_key.cc:200</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_aabe4a2f1541ca1e741305f58329e3881"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey::Create</a></div><div class="ttdeci">static RsaPublicKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00171">rsa_key.cc:171</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_ad05d8951dfe3a8af754490022e95e5f2"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">shaka::media::RsaPrivateKey::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00127">rsa_key.cc:127</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00096">rsa_key.cc:96</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dda/ts__section__psi_8h_source.html b/docs/d5/dda/ts__section__psi_8h_source.html
index bd08eb7647..b5a9794724 100644
--- a/docs/d5/dda/ts__section__psi_8h_source.html
+++ b/docs/d5/dda/ts__section__psi_8h_source.html
@@ -151,7 +151,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/de0/bit__reader_8cc_source.html b/docs/d5/de0/bit__reader_8cc_source.html
index 7d7d36df2a..58159eaedc 100644
--- a/docs/d5/de0/bit__reader_8cc_source.html
+++ b/docs/d5/de0/bit__reader_8cc_source.html
@@ -199,7 +199,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html b/docs/d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html
index 505c82d81e..bfd4d4af4b 100644
--- a/docs/d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html
+++ b/docs/d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html
@@ -122,7 +122,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Generates PesPackets from MediaSamples. Methods are virtual for mocking. </p>
 
-<p>Definition at line <a class="el" href="../../dd/d88/pes__packet__generator_8h_source.html#l00032">32</a> of file <a class="el" href="../../dd/d88/pes__packet__generator_8h_source.html">pes_packet_generator.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d88/pes__packet__generator_8h_source.html#l00031">31</a> of file <a class="el" href="../../dd/d88/pes__packet__generator_8h_source.html">pes_packet_generator.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a71ea0819224b94ba9df5c951424bc6b1"></a>
 <div class="memitem">
@@ -307,7 +307,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dec/classshaka_1_1media_1_1WebMParserClient.html b/docs/d5/dec/classshaka_1_1media_1_1WebMParserClient.html
index 21e68ec9c7..bcc3f61b43 100644
--- a/docs/d5/dec/classshaka_1_1media_1_1WebMParserClient.html
+++ b/docs/d5/dec/classshaka_1_1media_1_1WebMParserClient.html
@@ -151,7 +151,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dec/decoder__configuration__record_8cc_source.html b/docs/d5/dec/decoder__configuration__record_8cc_source.html
index 982878f8f7..5f5461c78f 100644
--- a/docs/d5/dec/decoder__configuration__record_8cc_source.html
+++ b/docs/d5/dec/decoder__configuration__record_8cc_source.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dec/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox-members.html b/docs/d5/dec/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox-members.html
index 6e62aa9a36..a7db2b4da5 100644
--- a/docs/d5/dec/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox-members.html
+++ b/docs/d5/dec/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/def/ts__section__pmt_8h_source.html b/docs/d5/def/ts__section__pmt_8h_source.html
index 36c2b785f1..b4f846bdcf 100644
--- a/docs/d5/def/ts__section__pmt_8h_source.html
+++ b/docs/d5/def/ts__section__pmt_8h_source.html
@@ -133,7 +133,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dfa/classshaka_1_1media_1_1HlsNotifyMuxerListener.html b/docs/d5/dfa/classshaka_1_1media_1_1HlsNotifyMuxerListener.html
index a24aed10af..97bfd498a0 100644
--- a/docs/d5/dfa/classshaka_1_1media_1_1HlsNotifyMuxerListener.html
+++ b/docs/d5/dfa/classshaka_1_1media_1_1HlsNotifyMuxerListener.html
@@ -535,7 +535,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dfa/classshaka_1_1media_1_1MediaParser-members.html b/docs/d5/dfa/classshaka_1_1media_1_1MediaParser-members.html
index 7b1c666fee..f92c11456e 100644
--- a/docs/d5/dfa/classshaka_1_1media_1_1MediaParser-members.html
+++ b/docs/d5/dfa/classshaka_1_1media_1_1MediaParser-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d5/dfc/file_8cc_source.html b/docs/d5/dfc/file_8cc_source.html
index 22164b6f49..24f414867a 100644
--- a/docs/d5/dfc/file_8cc_source.html
+++ b/docs/d5/dfc/file_8cc_source.html
@@ -376,7 +376,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d03/classshaka_1_1media_1_1AesCbcDecryptor-members.html b/docs/d6/d03/classshaka_1_1media_1_1AesCbcDecryptor-members.html
index 482d407cc2..1b4797debd 100644
--- a/docs/d6/d03/classshaka_1_1media_1_1AesCbcDecryptor-members.html
+++ b/docs/d6/d03/classshaka_1_1media_1_1AesCbcDecryptor-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d09/aes__pattern__cryptor_8h_source.html b/docs/d6/d09/aes__pattern__cryptor_8h_source.html
index 98f065724b..2bfa350a14 100644
--- a/docs/d6/d09/aes__pattern__cryptor_8h_source.html
+++ b/docs/d6/d09/aes__pattern__cryptor_8h_source.html
@@ -149,7 +149,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d16/text__stream__info_8cc_source.html b/docs/d6/d16/text__stream__info_8cc_source.html
index 7a32ec754c..8fad51369c 100644
--- a/docs/d6/d16/text__stream__info_8cc_source.html
+++ b/docs/d6/d16/text__stream__info_8cc_source.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d17/es__parser__h264_8cc_source.html b/docs/d6/d17/es__parser__h264_8cc_source.html
index 74720452a3..6d20301d49 100644
--- a/docs/d6/d17/es__parser__h264_8cc_source.html
+++ b/docs/d6/d17/es__parser__h264_8cc_source.html
@@ -261,7 +261,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d1a/structshaka_1_1media_1_1mp4_1_1MovieHeader.html b/docs/d6/d1a/structshaka_1_1media_1_1mp4_1_1MovieHeader.html
index b588dadd29..f3d86eeebe 100644
--- a/docs/d6/d1a/structshaka_1_1media_1_1mp4_1_1MovieHeader.html
+++ b/docs/d6/d1a/structshaka_1_1media_1_1mp4_1_1MovieHeader.html
@@ -200,7 +200,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d1a/ts__packet__writer__util_8cc_source.html b/docs/d6/d1a/ts__packet__writer__util_8cc_source.html
index 20c0a314da..375b3af366 100644
--- a/docs/d6/d1a/ts__packet__writer__util_8cc_source.html
+++ b/docs/d6/d1a/ts__packet__writer__util_8cc_source.html
@@ -255,7 +255,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d26/structshaka_1_1media_1_1VideoStreamInfoParameters.html b/docs/d6/d26/structshaka_1_1media_1_1VideoStreamInfoParameters.html
index 42fca32cf3..110af44de7 100644
--- a/docs/d6/d26/structshaka_1_1media_1_1VideoStreamInfoParameters.html
+++ b/docs/d6/d26/structshaka_1_1media_1_1VideoStreamInfoParameters.html
@@ -146,7 +146,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_encrypted</b></td>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d2e/mpd__notifier__util_8cc_source.html b/docs/d6/d2e/mpd__notifier__util_8cc_source.html
index 020e0f49e4..63d4b5f4df 100644
--- a/docs/d6/d2e/mpd__notifier__util_8cc_source.html
+++ b/docs/d6/d2e/mpd__notifier__util_8cc_source.html
@@ -162,15 +162,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;}</div>
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00058">mpd_builder.h:58</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00057">mpd_builder.h:57</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a4c7f8f964fec2bb9543e7ee8da9cd994"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">shaka::Uint8VectorToBase64</a></div><div class="ttdeci">std::string Uint8VectorToBase64(const std::vector&lt; uint8_t &gt; &amp;input)</div><div class="ttdoc">Converts uint8 vector into base64 encoded string. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00068">mpd_notifier_util.cc:68</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00428">mpd_builder.cc:428</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00427">mpd_builder.cc:427</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a5ea880937da26d677ff6a48c0219d090"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">shaka::GetContentType</a></div><div class="ttdeci">ContentType GetContentType(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00051">mpd_notifier_util.cc:51</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a7e940cda37fa0dbefef3b3cc9c802ab8"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">shaka::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(const std::string &amp;output_path, MpdBuilder *mpd_builder)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00020">mpd_notifier_util.cc:20</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d32/classshaka_1_1media_1_1TextTrack-members.html b/docs/d6/d32/classshaka_1_1media_1_1TextTrack-members.html
index 9695673fe1..2de2218ba3 100644
--- a/docs/d6/d32/classshaka_1_1media_1_1TextTrack-members.html
+++ b/docs/d6/d32/classshaka_1_1media_1_1TextTrack-members.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d35/webm__content__encodings_8cc_source.html b/docs/d6/d35/webm__content__encodings_8cc_source.html
index 03641614cd..f8e51c89b1 100644
--- a/docs/d6/d35/webm__content__encodings_8cc_source.html
+++ b/docs/d6/d35/webm__content__encodings_8cc_source.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d3b/chunk__info__iterator_8cc_source.html b/docs/d6/d3b/chunk__info__iterator_8cc_source.html
index d96d1f1bcb..40df470e47 100644
--- a/docs/d6/d3b/chunk__info__iterator_8cc_source.html
+++ b/docs/d6/d3b/chunk__info__iterator_8cc_source.html
@@ -171,7 +171,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d41/encrypting__fragmenter_8cc_source.html b/docs/d6/d41/encrypting__fragmenter_8cc_source.html
index 8850b7d150..24c211df57 100644
--- a/docs/d6/d41/encrypting__fragmenter_8cc_source.html
+++ b/docs/d6/d41/encrypting__fragmenter_8cc_source.html
@@ -499,7 +499,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html b/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html
index 7d7d4537ef..9dd95c418a 100644
--- a/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html
+++ b/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html
@@ -188,7 +188,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d55/aes__cryptor_8cc_source.html b/docs/d6/d55/aes__cryptor_8cc_source.html
index 93f311a973..7941ba1ad5 100644
--- a/docs/d6/d55/aes__cryptor_8cc_source.html
+++ b/docs/d6/d55/aes__cryptor_8cc_source.html
@@ -95,143 +95,139 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;openssl/aes.h&gt;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;openssl/err.h&gt;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;openssl/rand.h&gt;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;openssl/aes.h&gt;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;openssl/err.h&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;openssl/rand.h&gt;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
 <div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">// According to ISO/IEC 23001-7:2016 CENC spec, IV should be either</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// 64-bit (8-byte) or 128-bit (16-byte).</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keywordtype">bool</span> IsIvSizeValid(<span class="keywordtype">size_t</span> iv_size) {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keywordflow">return</span> iv_size == 8 || iv_size == 16;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;}</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
-<div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">   32</a></span>&#160;<a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">AesCryptor::AesCryptor</a>(ConstantIvFlag constant_iv_flag)</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    : aes_key_(new AES_KEY),</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;      constant_iv_flag_(constant_iv_flag),</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;      num_crypt_bytes_(0) {}</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;AesCryptor::~AesCryptor() {}</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="keywordtype">bool</span> AesCryptor::Crypt(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; text,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                       std::vector&lt;uint8_t&gt;* crypt_text) {</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="comment">// Save text size to make it work for in-place conversion, since the</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="comment">// next statement will update the text size.</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> text_size = text.size();</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  crypt_text-&gt;resize(text_size + NumPaddingBytes(text_size));</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordtype">size_t</span> crypt_text_size = crypt_text-&gt;size();</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordflow">if</span> (!Crypt(text.data(), text_size, crypt_text-&gt;data(), &amp;crypt_text_size)) {</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  }</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  DCHECK_LE(crypt_text_size, crypt_text-&gt;size());</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  crypt_text-&gt;resize(crypt_text_size);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;}</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="keywordtype">bool</span> AesCryptor::Crypt(<span class="keyword">const</span> std::string&amp; text, std::string* crypt_text) {</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// Save text size to make it work for in-place conversion, since the</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="comment">// next statement will update the text size.</span></div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> text_size = text.size();</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  crypt_text-&gt;resize(text_size + NumPaddingBytes(text_size));</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">size_t</span> crypt_text_size = crypt_text-&gt;size();</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordflow">if</span> (!Crypt(reinterpret_cast&lt;const uint8_t*&gt;(text.data()), text_size,</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;             reinterpret_cast&lt;uint8_t*&gt;(string_as_array(crypt_text)),</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;             &amp;crypt_text_size))</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  DCHECK_LE(crypt_text_size, crypt_text-&gt;size());</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  crypt_text-&gt;resize(crypt_text_size);</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;}</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00069"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">   69</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">AesCryptor::SetIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; iv) {</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">if</span> (!IsIvSizeValid(iv.size())) {</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid IV size: &quot;</span> &lt;&lt; iv.size();</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  }</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  iv_ = <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  num_crypt_bytes_ = 0;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  SetIvInternal();</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;}</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
-<div class="line"><a name="l00080"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">   80</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">AesCryptor::UpdateIv</a>() {</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">if</span> (constant_iv_flag_ == kUseConstantIv)</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  uint64_t increment = 0;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="comment">// As recommended in ISO/IEC 23001-7:2016 CENC spec, for 64-bit (8-byte)</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="comment">// IV_Sizes, initialization vectors for subsequent samples can be created by</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="comment">// incrementing the initialization vector of the previous sample.</span></div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="comment">// For 128-bit (16-byte) IV_Sizes, initialization vectors for subsequent</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="comment">// samples should be created by adding the block count of the previous sample</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// to the initialization vector of the previous sample.</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="comment">// There is no official recommendation of how IV for next sample should be</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="comment">// generated for CBC mode. We use the same generation algorithm as CTR here.</span></div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keywordflow">if</span> (iv_.size() == 8) {</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    increment = 1;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    DCHECK_EQ(16u, iv_.size());</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    increment = (num_crypt_bytes_ + AES_BLOCK_SIZE - 1) / AES_BLOCK_SIZE;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  }</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = iv_.size() - 1; increment &gt; 0 &amp;&amp; i &gt;= 0; --i) {</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    increment += iv_[i];</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    iv_[i] = increment &amp; 0xFF;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    increment &gt;&gt;= 8;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  }</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  num_crypt_bytes_ = 0;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  SetIvInternal();</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;}</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
-<div class="line"><a name="l00109"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">  109</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">AesCryptor::GenerateRandomIv</a>(FourCC protection_scheme,</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;                                  std::vector&lt;uint8_t&gt;* iv) {</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="comment">// ISO/IEC 23001-7:2016 10.1 and 10.3 For &#39;cenc&#39; and &#39;cens&#39;</span></div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="comment">// default_Per_Sample_IV_Size and Per_Sample_IV_Size SHOULD be 8-bytes.</span></div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="comment">// There is no official guideline on the iv size for &#39;cbc1&#39; and &#39;cbcs&#39;,</span></div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="comment">// but 16-byte provides better security.</span></div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> iv_size =</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      (protection_scheme == FOURCC_cenc || protection_scheme == FOURCC_cens)</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;          ? 8</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;          : 16;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  iv-&gt;resize(iv_size);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">if</span> (RAND_bytes(iv-&gt;data(), iv_size) != 1) {</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RAND_bytes failed with error: &quot;</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;               &lt;&lt; ERR_error_string(ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  }</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;<span class="keywordtype">size_t</span> AesCryptor::NumPaddingBytes(<span class="keywordtype">size_t</span> size)<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  <span class="comment">// No padding by default.</span></div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordflow">return</span> 0;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;}</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a812dfc641212f8eb877ab153de7fbb37"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">shaka::media::AesCryptor::UpdateIv</a></div><div class="ttdeci">void UpdateIv()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00080">aes_cryptor.cc:80</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a47fbdacc296fbddd899c47ec0c17e5e8"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">shaka::media::AesCryptor::AesCryptor</a></div><div class="ttdeci">AesCryptor(ConstantIvFlag constant_iv_flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00032">aes_cryptor.cc:32</a></div></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">// According to ISO/IEC 23001-7:2016 CENC spec, IV should be either</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">// 64-bit (8-byte) or 128-bit (16-byte).</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keywordtype">bool</span> IsIvSizeValid(<span class="keywordtype">size_t</span> iv_size) {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keywordflow">return</span> iv_size == 8 || iv_size == 16;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;}</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
+<div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">   31</a></span>&#160;<a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">AesCryptor::AesCryptor</a>(ConstantIvFlag constant_iv_flag)</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    : aes_key_(new AES_KEY),</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;      constant_iv_flag_(constant_iv_flag),</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;      num_crypt_bytes_(0) {}</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;AesCryptor::~AesCryptor() {}</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keywordtype">bool</span> AesCryptor::Crypt(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; text,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                       std::vector&lt;uint8_t&gt;* crypt_text) {</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="comment">// Save text size to make it work for in-place conversion, since the</span></div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="comment">// next statement will update the text size.</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> text_size = text.size();</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  crypt_text-&gt;resize(text_size + NumPaddingBytes(text_size));</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">size_t</span> crypt_text_size = crypt_text-&gt;size();</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordflow">if</span> (!Crypt(text.data(), text_size, crypt_text-&gt;data(), &amp;crypt_text_size)) {</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  }</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  DCHECK_LE(crypt_text_size, crypt_text-&gt;size());</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  crypt_text-&gt;resize(crypt_text_size);</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keywordtype">bool</span> AesCryptor::Crypt(<span class="keyword">const</span> std::string&amp; text, std::string* crypt_text) {</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// Save text size to make it work for in-place conversion, since the</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// next statement will update the text size.</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> text_size = text.size();</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  crypt_text-&gt;resize(text_size + NumPaddingBytes(text_size));</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="keywordtype">size_t</span> crypt_text_size = crypt_text-&gt;size();</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordflow">if</span> (!Crypt(reinterpret_cast&lt;const uint8_t*&gt;(text.data()), text_size,</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;             reinterpret_cast&lt;uint8_t*&gt;(&amp;(*crypt_text)[0]), &amp;crypt_text_size))</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  DCHECK_LE(crypt_text_size, crypt_text-&gt;size());</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  crypt_text-&gt;resize(crypt_text_size);</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;}</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">   67</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">AesCryptor::SetIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; iv) {</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordflow">if</span> (!IsIvSizeValid(iv.size())) {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid IV size: &quot;</span> &lt;&lt; iv.size();</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  }</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  iv_ = <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  num_crypt_bytes_ = 0;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  SetIvInternal();</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;}</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;</div>
+<div class="line"><a name="l00078"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">   78</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">AesCryptor::UpdateIv</a>() {</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordflow">if</span> (constant_iv_flag_ == kUseConstantIv)</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  uint64_t increment = 0;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="comment">// As recommended in ISO/IEC 23001-7:2016 CENC spec, for 64-bit (8-byte)</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="comment">// IV_Sizes, initialization vectors for subsequent samples can be created by</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="comment">// incrementing the initialization vector of the previous sample.</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="comment">// For 128-bit (16-byte) IV_Sizes, initialization vectors for subsequent</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="comment">// samples should be created by adding the block count of the previous sample</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="comment">// to the initialization vector of the previous sample.</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="comment">// There is no official recommendation of how IV for next sample should be</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// generated for CBC mode. We use the same generation algorithm as CTR here.</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keywordflow">if</span> (iv_.size() == 8) {</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    increment = 1;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    DCHECK_EQ(16u, iv_.size());</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    increment = (num_crypt_bytes_ + AES_BLOCK_SIZE - 1) / AES_BLOCK_SIZE;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  }</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = iv_.size() - 1; increment &gt; 0 &amp;&amp; i &gt;= 0; --i) {</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    increment += iv_[i];</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    iv_[i] = increment &amp; 0xFF;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    increment &gt;&gt;= 8;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  }</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  num_crypt_bytes_ = 0;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  SetIvInternal();</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;}</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;</div>
+<div class="line"><a name="l00107"></a><span class="lineno"><a class="line" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">  107</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">AesCryptor::GenerateRandomIv</a>(FourCC protection_scheme,</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                                  std::vector&lt;uint8_t&gt;* iv) {</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="comment">// ISO/IEC 23001-7:2016 10.1 and 10.3 For &#39;cenc&#39; and &#39;cens&#39;</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="comment">// default_Per_Sample_IV_Size and Per_Sample_IV_Size SHOULD be 8-bytes.</span></div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="comment">// There is no official guideline on the iv size for &#39;cbc1&#39; and &#39;cbcs&#39;,</span></div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="comment">// but 16-byte provides better security.</span></div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> iv_size =</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;      (protection_scheme == FOURCC_cenc || protection_scheme == FOURCC_cens)</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;          ? 8</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;          : 16;</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  iv-&gt;resize(iv_size);</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keywordflow">if</span> (RAND_bytes(iv-&gt;data(), iv_size) != 1) {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RAND_bytes failed with error: &quot;</span></div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;               &lt;&lt; ERR_error_string(ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  }</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;}</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;<span class="keywordtype">size_t</span> AesCryptor::NumPaddingBytes(<span class="keywordtype">size_t</span> size)<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="comment">// No padding by default.</span></div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordflow">return</span> 0;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;}</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a812dfc641212f8eb877ab153de7fbb37"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a812dfc641212f8eb877ab153de7fbb37">shaka::media::AesCryptor::UpdateIv</a></div><div class="ttdeci">void UpdateIv()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00078">aes_cryptor.cc:78</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a47fbdacc296fbddd899c47ec0c17e5e8"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">shaka::media::AesCryptor::AesCryptor</a></div><div class="ttdeci">AesCryptor(ConstantIvFlag constant_iv_flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00031">aes_cryptor.cc:31</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">aes_cryptor.cc:69</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">aes_cryptor.cc:67</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d57/classshaka_1_1media_1_1AVCDecoderConfigurationRecord.html b/docs/d6/d57/classshaka_1_1media_1_1AVCDecoderConfigurationRecord.html
index f8d5902ec0..240c214095 100644
--- a/docs/d6/d57/classshaka_1_1media_1_1AVCDecoderConfigurationRecord.html
+++ b/docs/d6/d57/classshaka_1_1media_1_1AVCDecoderConfigurationRecord.html
@@ -244,7 +244,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d59/protection__system__specific__info_8h_source.html b/docs/d6/d59/protection__system__specific__info_8h_source.html
index 113d69bdd7..c70f5a4de0 100644
--- a/docs/d6/d59/protection__system__specific__info_8h_source.html
+++ b/docs/d6/d59/protection__system__specific__info_8h_source.html
@@ -163,7 +163,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d60/classshaka_1_1media_1_1VPCodecConfigurationRecord-members.html b/docs/d6/d60/classshaka_1_1media_1_1VPCodecConfigurationRecord-members.html
index 1b8ef9eec6..227b0e3f5c 100644
--- a/docs/d6/d60/classshaka_1_1media_1_1VPCodecConfigurationRecord-members.html
+++ b/docs/d6/d60/classshaka_1_1media_1_1VPCodecConfigurationRecord-members.html
@@ -134,7 +134,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d6c/h26x__bit__reader_8cc_source.html b/docs/d6/d6c/h26x__bit__reader_8cc_source.html
index 6288882c21..4b91428d41 100644
--- a/docs/d6/d6c/h26x__bit__reader_8cc_source.html
+++ b/docs/d6/d6c/h26x__bit__reader_8cc_source.html
@@ -259,7 +259,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d6e/ts__section__pes_8cc_source.html b/docs/d6/d6e/ts__section__pes_8cc_source.html
index 6a92eb6273..369b6ddc46 100644
--- a/docs/d6/d6e/ts__section__pes_8cc_source.html
+++ b/docs/d6/d6e/ts__section__pes_8cc_source.html
@@ -405,7 +405,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d71/scoped__xml__ptr_8h_source.html b/docs/d6/d71/scoped__xml__ptr_8h_source.html
index 0442dd9200..c9a17da2ae 100644
--- a/docs/d6/d71/scoped__xml__ptr_8h_source.html
+++ b/docs/d6/d71/scoped__xml__ptr_8h_source.html
@@ -132,7 +132,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html b/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html
index 16176d19e3..549c186bb4 100644
--- a/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html
+++ b/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html
@@ -193,24 +193,24 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
 <div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_DASH_IOP_MPD_NOTIFIER_H_</span></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ab3411eb75eedce9a26f0767210280e71"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">shaka::DashIopMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00156">dash_iop_mpd_notifier.cc:156</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ad2561d25eb7ace9b919ef8b96d4a06a7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">shaka::DashIopMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00113">dash_iop_mpd_notifier.cc:113</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a093eac08e6fdc396e6bbcbc58d35a3c3"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">shaka::DashIopMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00127">dash_iop_mpd_notifier.cc:127</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00058">mpd_builder.h:58</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ab3411eb75eedce9a26f0767210280e71"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">shaka::DashIopMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00157">dash_iop_mpd_notifier.cc:157</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ad2561d25eb7ace9b919ef8b96d4a06a7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">shaka::DashIopMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00114">dash_iop_mpd_notifier.cc:114</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a093eac08e6fdc396e6bbcbc58d35a3c3"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">shaka::DashIopMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00128">dash_iop_mpd_notifier.cc:128</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00057">mpd_builder.h:57</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9ec74194872324aad3838f1047fdbe13"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">shaka::DashIopMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00101">dash_iop_mpd_notifier.cc:101</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9ec74194872324aad3838f1047fdbe13"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">shaka::DashIopMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00102">dash_iop_mpd_notifier.cc:102</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdNotifier_html"><div class="ttname"><a href="../../d3/dd0/classshaka_1_1MpdNotifier.html">shaka::MpdNotifier</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d15/mpd__notifier_8h_source.html#l00032">mpd_notifier.h:32</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdNotifier_html_a3eb0f05b01d475eff0a75bab71f21149"><div class="ttname"><a href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a3eb0f05b01d475eff0a75bab71f21149">shaka::MpdNotifier::dash_profile</a></div><div class="ttdeci">DashProfile dash_profile() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d15/mpd__notifier_8h_source.html#l00108">mpd_notifier.h:108</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a6afc2b87efd66cb12f75f5e519e0888d"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">shaka::DashIopMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00146">dash_iop_mpd_notifier.cc:146</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a6afc2b87efd66cb12f75f5e519e0888d"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">shaka::DashIopMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00147">dash_iop_mpd_notifier.cc:147</a></div></div>
 <div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html">shaka::DashIopMpdNotifier</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d77/dash__iop__mpd__notifier_8h_source.html#l00030">dash_iop_mpd_notifier.h:30</a></div></div>
 <div class="ttc" id="structshaka_1_1MpdOptions_html"><div class="ttname"><a href="../../d1/df3/structshaka_1_1MpdOptions.html">shaka::MpdOptions</a></div><div class="ttdoc">Defines Mpd Options. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d60/mpd__options_8h_source.html#l00015">mpd_options.h:15</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9dd9d655a538ff2618634ca1f9809478"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">shaka::DashIopMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00061">dash_iop_mpd_notifier.cc:61</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_af86163b8fc680ea659e6ba2d2c5d6db7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">shaka::DashIopMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00065">dash_iop_mpd_notifier.cc:65</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9dd9d655a538ff2618634ca1f9809478"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">shaka::DashIopMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00062">dash_iop_mpd_notifier.cc:62</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_af86163b8fc680ea659e6ba2d2c5d6db7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">shaka::DashIopMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00066">dash_iop_mpd_notifier.cc:66</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d79/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox.html b/docs/d6/d79/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox.html
index 62e9412d88..c381247862 100644
--- a/docs/d6/d79/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox.html
+++ b/docs/d6/d79/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d7b/webm__tracks__parser_8h_source.html b/docs/d6/d7b/webm__tracks__parser_8h_source.html
index e918c5f089..456df3929a 100644
--- a/docs/d6/d7b/webm__tracks__parser_8h_source.html
+++ b/docs/d6/d7b/webm__tracks__parser_8h_source.html
@@ -201,7 +201,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d7c/structshaka_1_1media_1_1mp4_1_1AC3Specific-members.html b/docs/d6/d7c/structshaka_1_1media_1_1mp4_1_1AC3Specific-members.html
index 02da8ae53f..30b91c70e7 100644
--- a/docs/d6/d7c/structshaka_1_1media_1_1mp4_1_1AC3Specific-members.html
+++ b/docs/d6/d7c/structshaka_1_1media_1_1mp4_1_1AC3Specific-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d86/bandwidth__estimator_8cc_source.html b/docs/d6/d86/bandwidth__estimator_8cc_source.html
index abd38b989a..7f4eb0c933 100644
--- a/docs/d6/d86/bandwidth__estimator_8cc_source.html
+++ b/docs/d6/d86/bandwidth__estimator_8cc_source.html
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d8a/vp9__parser_8cc_source.html b/docs/d6/d8a/vp9__parser_8cc_source.html
index f75fc16a6b..44fba99072 100644
--- a/docs/d6/d8a/vp9__parser_8cc_source.html
+++ b/docs/d6/d8a/vp9__parser_8cc_source.html
@@ -660,7 +660,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d8f/classshaka_1_1xml_1_1RepresentationBaseXmlNode-members.html b/docs/d6/d8f/classshaka_1_1xml_1_1RepresentationBaseXmlNode-members.html
index 3168578066..4f4e88f910 100644
--- a/docs/d6/d8f/classshaka_1_1xml_1_1RepresentationBaseXmlNode-members.html
+++ b/docs/d6/d8f/classshaka_1_1xml_1_1RepresentationBaseXmlNode-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d9b/h264__parser_8h_source.html b/docs/d6/d9b/h264__parser_8h_source.html
index 3551d201ff..59f1f2b18a 100644
--- a/docs/d6/d9b/h264__parser_8h_source.html
+++ b/docs/d6/d9b/h264__parser_8h_source.html
@@ -100,346 +100,347 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;stdlib.h&gt;</span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;map&gt;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/h26x_bit_reader.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">// On success, |coded_width| and |coded_height| contains coded resolution after</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// cropping; |pixel_width:pixel_height| contains pixel aspect ratio, 1:1 is</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">// assigned if it is not present in SPS.</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">struct </span>H264Sps;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H264Sps&amp; sps,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                              uint32_t* coded_width,</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                              uint32_t* coded_height,</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                              uint32_t* pixel_width,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                              uint32_t* pixel_height);</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">enum</span> {</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  kH264ScalingList4x4Length = 16,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  kH264ScalingList8x8Length = 64,</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;};</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
-<div class="line"><a name="l00036"></a><span class="lineno"><a class="line" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">   36</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a> {</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>();</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keywordtype">int</span> profile_idc;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> constraint_set0_flag;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> constraint_set1_flag;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">bool</span> constraint_set2_flag;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordtype">bool</span> constraint_set3_flag;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">bool</span> constraint_set4_flag;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordtype">bool</span> constraint_set5_flag;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordtype">int</span> level_idc;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordtype">int</span> seq_parameter_set_id;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordtype">int</span> chroma_format_idc;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">bool</span> separate_colour_plane_flag;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">int</span> bit_depth_luma_minus8;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordtype">int</span> bit_depth_chroma_minus8;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">bool</span> qpprime_y_zero_transform_bypass_flag;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">bool</span> seq_scaling_matrix_present_flag;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">int</span> scaling_list4x4[6][kH264ScalingList4x4Length];</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordtype">int</span> scaling_list8x8[6][kH264ScalingList8x8Length];</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">int</span> log2_max_frame_num_minus4;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">int</span> pic_order_cnt_type;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">int</span> log2_max_pic_order_cnt_lsb_minus4;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">bool</span> delta_pic_order_always_zero_flag;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordtype">int</span> offset_for_non_ref_pic;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">int</span> offset_for_top_to_bottom_field;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">int</span> num_ref_frames_in_pic_order_cnt_cycle;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">int</span> expected_delta_per_pic_order_cnt_cycle;  <span class="comment">// calculated</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">int</span> offset_for_ref_frame[255];</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">int</span> max_num_ref_frames;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">bool</span> gaps_in_frame_num_value_allowed_flag;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">int</span> pic_width_in_mbs_minus1;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordtype">int</span> pic_height_in_map_units_minus1;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">bool</span> frame_mbs_only_flag;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordtype">bool</span> mb_adaptive_frame_field_flag;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordtype">bool</span> direct_8x8_inference_flag;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordtype">bool</span> frame_cropping_flag;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">int</span> frame_crop_left_offset;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">int</span> frame_crop_right_offset;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">int</span> frame_crop_top_offset;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordtype">int</span> frame_crop_bottom_offset;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordtype">bool</span> vui_parameters_present_flag;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordtype">int</span> sar_width;    <span class="comment">// Set to 0 when not specified.</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keywordtype">int</span> sar_height;   <span class="comment">// Set to 0 when not specified.</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordtype">bool</span> bitstream_restriction_flag;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="keywordtype">int</span> max_num_reorder_frames;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordtype">int</span> max_dec_frame_buffering;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keywordtype">int</span> chroma_array_type;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;};</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
-<div class="line"><a name="l00091"></a><span class="lineno"><a class="line" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">   91</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a> {</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>();</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="keywordtype">int</span> pic_parameter_set_id;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="keywordtype">int</span> seq_parameter_set_id;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordtype">bool</span> entropy_coding_mode_flag;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordtype">bool</span> bottom_field_pic_order_in_frame_present_flag;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordtype">int</span> num_slice_groups_minus1;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l0_default_active_minus1;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l1_default_active_minus1;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordtype">bool</span> weighted_pred_flag;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="keywordtype">int</span> weighted_bipred_idc;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordtype">int</span> pic_init_qp_minus26;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">int</span> pic_init_qs_minus26;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordtype">int</span> chroma_qp_index_offset;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">bool</span> deblocking_filter_control_present_flag;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordtype">bool</span> constrained_intra_pred_flag;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordtype">bool</span> redundant_pic_cnt_present_flag;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordtype">bool</span> transform_8x8_mode_flag;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keywordtype">bool</span> pic_scaling_matrix_present_flag;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keywordtype">int</span> scaling_list4x4[6][kH264ScalingList4x4Length];</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordtype">int</span> scaling_list8x8[6][kH264ScalingList8x8Length];</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="keywordtype">int</span> second_chroma_qp_index_offset;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;};</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
-<div class="line"><a name="l00118"></a><span class="lineno"><a class="line" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">  118</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> {</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keywordtype">int</span> modification_of_pic_nums_idc;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keyword">union </span>{</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keywordtype">int</span> abs_diff_pic_num_minus1;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordtype">int</span> long_term_pic_num;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  };</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;};</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div>
-<div class="line"><a name="l00126"></a><span class="lineno"><a class="line" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">  126</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> {</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="keywordtype">bool</span> luma_weight_flag;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_flag;</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  <span class="keywordtype">int</span> luma_weight[32];</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordtype">int</span> luma_offset[32];</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordtype">int</span> chroma_weight[32][2];</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  <span class="keywordtype">int</span> chroma_offset[32][2];</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;};</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;</div>
-<div class="line"><a name="l00135"></a><span class="lineno"><a class="line" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">  135</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">H264DecRefPicMarking</a> {</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  <span class="keywordtype">int</span> memory_mgmnt_control_operation;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordtype">int</span> difference_of_pic_nums_minus1;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordtype">int</span> long_term_pic_num;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="keywordtype">int</span> long_term_frame_idx;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordtype">int</span> max_long_term_frame_idx_plus1;</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;};</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;</div>
-<div class="line"><a name="l00143"></a><span class="lineno"><a class="line" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">  143</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a> {</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>();</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  <span class="keyword">enum</span> {</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    kRefListSize = 32,</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    kRefListModSize = kRefListSize</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  };</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="keyword">enum</span> Type {</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    kPSlice = 0,</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;    kBSlice = 1,</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    kISlice = 2,</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    kSPSlice = 3,</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    kSISlice = 4,</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  };</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="keywordtype">bool</span> IsPSlice() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordtype">bool</span> IsBSlice() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordtype">bool</span> IsISlice() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keywordtype">bool</span> IsSPSlice() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keywordtype">bool</span> IsSISlice() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="keywordtype">bool</span> idr_pic_flag;       <span class="comment">// from NAL header</span></div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordtype">int</span> nal_ref_idc;         <span class="comment">// from NAL header</span></div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keyword">const</span> uint8_t* nalu_data;  <span class="comment">// from NAL header</span></div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  off_t nalu_size;         <span class="comment">// from NAL header</span></div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  off_t header_bit_size;   <span class="comment">// calculated</span></div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="keywordtype">int</span> first_mb_in_slice;</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="keywordtype">int</span> slice_type;</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordtype">int</span> pic_parameter_set_id;</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordtype">int</span> colour_plane_id;</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="keywordtype">int</span> frame_num;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  <span class="keywordtype">bool</span> field_pic_flag;</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keywordtype">bool</span> bottom_field_flag;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <span class="keywordtype">int</span> idr_pic_id;</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordtype">int</span> pic_order_cnt_lsb;</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keywordtype">int</span> delta_pic_order_cnt_bottom;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <span class="keywordtype">int</span> delta_pic_order_cnt[2];</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordtype">int</span> redundant_pic_cnt;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordtype">bool</span> direct_spatial_mv_pred_flag;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="keywordtype">bool</span> num_ref_idx_active_override_flag;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l0_active_minus1;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l1_active_minus1;</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l0;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l1;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> ref_list_l0_modifications[kRefListModSize];</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> ref_list_l1_modifications[kRefListModSize];</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordtype">int</span> luma_log2_weight_denom;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordtype">int</span> chroma_log2_weight_denom;</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="keywordtype">bool</span> luma_weight_l0_flag;</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_l0_flag;</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> pred_weight_table_l0;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keywordtype">bool</span> luma_weight_l1_flag;</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_l1_flag;</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> pred_weight_table_l1;</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  <span class="keywordtype">bool</span> no_output_of_prior_pics_flag;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  <span class="keywordtype">bool</span> long_term_reference_flag;</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordtype">bool</span> adaptive_ref_pic_marking_mode_flag;</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <a class="code" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">H264DecRefPicMarking</a> ref_pic_marking[kRefListSize];</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  <span class="keywordtype">int</span> cabac_init_idc;</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keywordtype">int</span> slice_qp_delta;</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="keywordtype">bool</span> sp_for_switch_flag;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="keywordtype">int</span> slice_qs_delta;</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordtype">int</span> disable_deblocking_filter_idc;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="keywordtype">int</span> slice_alpha_c0_offset_div2;</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="keywordtype">int</span> slice_beta_offset_div2;</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;};</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;</div>
-<div class="line"><a name="l00219"></a><span class="lineno"><a class="line" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">  219</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">H264SEIRecoveryPoint</a> {</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordtype">int</span> recovery_frame_cnt;</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  <span class="keywordtype">bool</span> exact_match_flag;</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keywordtype">bool</span> broken_link_flag;</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  <span class="keywordtype">int</span> changing_slice_group_idc;</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;};</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
-<div class="line"><a name="l00226"></a><span class="lineno"><a class="line" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">  226</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a> {</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  <a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a>();</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  <span class="keyword">enum</span> Type {</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    kSEIRecoveryPoint = 6,</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  };</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keywordtype">int</span> type;</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  <span class="keywordtype">int</span> payload_size;</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keyword">union </span>{</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="comment">// Placeholder; in future more supported types will contribute to more</span></div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="comment">// union members here.</span></div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <a class="code" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">H264SEIRecoveryPoint</a> recovery_point;</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  };</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;};</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;<span class="comment">// Class to parse an Annex-B H.264 stream,</span></div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;<span class="comment">// as specified in chapters 7 and Annex B of the H.264 spec.</span></div>
-<div class="line"><a name="l00244"></a><span class="lineno"><a class="line" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">  244</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a> {</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  <span class="keyword">enum</span> Result {</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;    kOk,</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;    kInvalidStream,      <span class="comment">// error in stream</span></div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;    kUnsupportedStream,  <span class="comment">// stream not supported by the parser</span></div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    kEOStream,           <span class="comment">// end of stream</span></div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  };</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  <a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>();</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  ~<a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>();</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;  <span class="comment">// NALU-specific parsing functions.</span></div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  <span class="comment">// SPSes and PPSes are owned by the parser class and the memory for their</span></div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="comment">// structures is managed here, not by the caller, as they are reused</span></div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;  <span class="comment">// across NALUs.</span></div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="comment">//</span></div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  <span class="comment">// Parse an SPS/PPS NALU and save their data in the parser, returning id</span></div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="comment">// of the parsed structure in |*pps_id|/|*sps_id|.</span></div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;  <span class="comment">// To get a pointer to a given SPS/PPS structure, use GetSps()/GetPps(),</span></div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;  <span class="comment">// passing the returned |*sps_id|/|*pps_id| as parameter.</span></div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;  Result ParseSps(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* sps_id);</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;  Result ParsePps(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* pps_id);</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;  <span class="comment">// Return a pointer to SPS/PPS with given |sps_id|/|pps_id| or NULL if not</span></div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  <span class="comment">// present.</span></div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* GetSps(<span class="keywordtype">int</span> sps_id);</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>* GetPps(<span class="keywordtype">int</span> pps_id);</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;  <span class="comment">// Slice headers and SEI messages are not used across NALUs by the parser</span></div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  <span class="comment">// and can be discarded after current NALU, so the parser does not store</span></div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;  <span class="comment">// them, nor does it manage their memory.</span></div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  <span class="comment">// The caller has to provide and manage it instead.</span></div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;  <span class="comment">// Parse a slice header, returning it in |*shdr|. |*nalu| must be set to</span></div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;  <span class="comment">// the NALU returned from AdvanceToNextNALU() and corresponding to |*shdr|.</span></div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;  Result ParseSliceHeader(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;  <span class="comment">// Parse a SEI message, returning it in |*sei_msg|, provided and managed</span></div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;  <span class="comment">// by the caller.</span></div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;  Result ParseSEI(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a>* sei_msg);</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;  <span class="comment">// Parse scaling lists (see spec).</span></div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  Result ParseScalingList(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;                          <span class="keywordtype">int</span> size,</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                          <span class="keywordtype">int</span>* scaling_list,</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;                          <span class="keywordtype">bool</span>* use_default);</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  Result ParseSpsScalingLists(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* sps);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  Result ParsePpsScalingLists(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;                              <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>&amp; sps,</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;                              <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>* pps);</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;  <span class="comment">// Parse optional VUI parameters in SPS (see spec).</span></div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;  Result ParseVUIParameters(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* sps);</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  <span class="comment">// Set |hrd_parameters_present| to true only if they are present.</span></div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  Result ParseAndIgnoreHRDParameters(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;                                     <span class="keywordtype">bool</span>* hrd_parameters_present);</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;  <span class="comment">// Parse reference picture lists&#39; modifications (see spec).</span></div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  Result ParseRefPicListModifications(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  Result ParseRefPicListModification(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;                                     <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;                                     <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a>* ref_list_mods);</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  <span class="comment">// Parse prediction weight table (see spec).</span></div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  Result ParsePredWeightTable(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;                              <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>&amp; sps,</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;                              <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  <span class="comment">// Parse weighting factors (see spec).</span></div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  Result ParseWeightingFactors(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;                               <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;                               <span class="keywordtype">int</span> chroma_array_type,</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;                               <span class="keywordtype">int</span> luma_log2_weight_denom,</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                               <span class="keywordtype">int</span> chroma_log2_weight_denom,</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                               <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a>* w_facts);</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  <span class="comment">// Parse decoded reference picture marking information (see spec).</span></div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  Result ParseDecRefPicMarking(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  <span class="comment">// PPSes and SPSes stored for future reference.</span></div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, H264Sps*&gt; SpsById;</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, H264Pps*&gt; PpsById;</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  SpsById active_SPSes_;</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  PpsById active_PPSes_;</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>);</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;};</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;<span class="preprocessor">#endif  // MEDIA_CODECS_H264_PARSER_H_</span></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264SliceHeader_html"><div class="ttname"><a href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">shaka::media::H264SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00143">h264_parser.h:143</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H264Parser_html"><div class="ttname"><a href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">shaka::media::H264Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00244">h264_parser.h:244</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264SEIRecoveryPoint_html"><div class="ttname"><a href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">shaka::media::H264SEIRecoveryPoint</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00219">h264_parser.h:219</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264Pps_html"><div class="ttname"><a href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">shaka::media::H264Pps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00091">h264_parser.h:91</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264Sps_html"><div class="ttname"><a href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">shaka::media::H264Sps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00036">h264_parser.h:36</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264DecRefPicMarking_html"><div class="ttname"><a href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">shaka::media::H264DecRefPicMarking</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00135">h264_parser.h:135</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264SEIMessage_html"><div class="ttname"><a href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">shaka::media::H264SEIMessage</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00226">h264_parser.h:226</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264ModificationOfPicNum_html"><div class="ttname"><a href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">shaka::media::H264ModificationOfPicNum</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00118">h264_parser.h:118</a></div></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/h26x_bit_reader.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// On success, |coded_width| and |coded_height| contains coded resolution after</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">// cropping; |pixel_width:pixel_height| contains pixel aspect ratio, 1:1 is</span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// assigned if it is not present in SPS.</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">struct </span>H264Sps;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H264Sps&amp; sps,</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                              uint32_t* coded_width,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                              uint32_t* coded_height,</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                              uint32_t* pixel_width,</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                              uint32_t* pixel_height);</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">enum</span> {</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  kH264ScalingList4x4Length = 16,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  kH264ScalingList8x8Length = 64,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;};</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
+<div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">   37</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a> {</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>();</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">int</span> profile_idc;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> constraint_set0_flag;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">bool</span> constraint_set1_flag;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordtype">bool</span> constraint_set2_flag;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">bool</span> constraint_set3_flag;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordtype">bool</span> constraint_set4_flag;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordtype">bool</span> constraint_set5_flag;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordtype">int</span> level_idc;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keywordtype">int</span> seq_parameter_set_id;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">int</span> chroma_format_idc;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">bool</span> separate_colour_plane_flag;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordtype">int</span> bit_depth_luma_minus8;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">int</span> bit_depth_chroma_minus8;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">bool</span> qpprime_y_zero_transform_bypass_flag;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">bool</span> seq_scaling_matrix_present_flag;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordtype">int</span> scaling_list4x4[6][kH264ScalingList4x4Length];</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="keywordtype">int</span> scaling_list8x8[6][kH264ScalingList8x8Length];</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">int</span> log2_max_frame_num_minus4;</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">int</span> pic_order_cnt_type;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">int</span> log2_max_pic_order_cnt_lsb_minus4;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordtype">bool</span> delta_pic_order_always_zero_flag;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">int</span> offset_for_non_ref_pic;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">int</span> offset_for_top_to_bottom_field;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">int</span> num_ref_frames_in_pic_order_cnt_cycle;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">int</span> expected_delta_per_pic_order_cnt_cycle;  <span class="comment">// calculated</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">int</span> offset_for_ref_frame[255];</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">int</span> max_num_ref_frames;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">bool</span> gaps_in_frame_num_value_allowed_flag;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordtype">int</span> pic_width_in_mbs_minus1;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">int</span> pic_height_in_map_units_minus1;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordtype">bool</span> frame_mbs_only_flag;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordtype">bool</span> mb_adaptive_frame_field_flag;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordtype">bool</span> direct_8x8_inference_flag;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">bool</span> frame_cropping_flag;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">int</span> frame_crop_left_offset;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">int</span> frame_crop_right_offset;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordtype">int</span> frame_crop_top_offset;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordtype">int</span> frame_crop_bottom_offset;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordtype">bool</span> vui_parameters_present_flag;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keywordtype">int</span> sar_width;    <span class="comment">// Set to 0 when not specified.</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordtype">int</span> sar_height;   <span class="comment">// Set to 0 when not specified.</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="keywordtype">bool</span> bitstream_restriction_flag;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordtype">int</span> max_num_reorder_frames;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="keywordtype">int</span> max_dec_frame_buffering;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keywordtype">int</span> chroma_array_type;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;};</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno"><a class="line" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">   92</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a> {</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>();</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="keywordtype">int</span> pic_parameter_set_id;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordtype">int</span> seq_parameter_set_id;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordtype">bool</span> entropy_coding_mode_flag;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordtype">bool</span> bottom_field_pic_order_in_frame_present_flag;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordtype">int</span> num_slice_groups_minus1;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l0_default_active_minus1;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l1_default_active_minus1;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="keywordtype">bool</span> weighted_pred_flag;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordtype">int</span> weighted_bipred_idc;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">int</span> pic_init_qp_minus26;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordtype">int</span> pic_init_qs_minus26;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">int</span> chroma_qp_index_offset;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordtype">bool</span> deblocking_filter_control_present_flag;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordtype">bool</span> constrained_intra_pred_flag;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordtype">bool</span> redundant_pic_cnt_present_flag;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordtype">bool</span> transform_8x8_mode_flag;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keywordtype">bool</span> pic_scaling_matrix_present_flag;</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordtype">int</span> scaling_list4x4[6][kH264ScalingList4x4Length];</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="keywordtype">int</span> scaling_list8x8[6][kH264ScalingList8x8Length];</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="keywordtype">int</span> second_chroma_qp_index_offset;</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;};</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div>
+<div class="line"><a name="l00119"></a><span class="lineno"><a class="line" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">  119</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> {</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordtype">int</span> modification_of_pic_nums_idc;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keyword">union </span>{</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordtype">int</span> abs_diff_pic_num_minus1;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordtype">int</span> long_term_pic_num;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  };</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;};</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
+<div class="line"><a name="l00127"></a><span class="lineno"><a class="line" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">  127</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> {</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordtype">bool</span> luma_weight_flag;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_flag;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordtype">int</span> luma_weight[32];</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordtype">int</span> luma_offset[32];</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  <span class="keywordtype">int</span> chroma_weight[32][2];</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  <span class="keywordtype">int</span> chroma_offset[32][2];</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;};</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;</div>
+<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">  136</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">H264DecRefPicMarking</a> {</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordtype">int</span> memory_mgmnt_control_operation;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordtype">int</span> difference_of_pic_nums_minus1;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="keywordtype">int</span> long_term_pic_num;</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordtype">int</span> long_term_frame_idx;</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordtype">int</span> max_long_term_frame_idx_plus1;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;};</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;</div>
+<div class="line"><a name="l00144"></a><span class="lineno"><a class="line" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">  144</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a> {</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>();</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  <span class="keyword">enum</span> {</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    kRefListSize = 32,</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    kRefListModSize = kRefListSize</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  };</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  <span class="keyword">enum</span> Type {</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;    kPSlice = 0,</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    kBSlice = 1,</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    kISlice = 2,</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    kSPSlice = 3,</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    kSISlice = 4,</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  };</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordtype">bool</span> IsPSlice() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordtype">bool</span> IsBSlice() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keywordtype">bool</span> IsISlice() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keywordtype">bool</span> IsSPSlice() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="keywordtype">bool</span> IsSISlice() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordtype">bool</span> idr_pic_flag;       <span class="comment">// from NAL header</span></div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordtype">int</span> nal_ref_idc;         <span class="comment">// from NAL header</span></div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keyword">const</span> uint8_t* nalu_data;  <span class="comment">// from NAL header</span></div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  off_t nalu_size;         <span class="comment">// from NAL header</span></div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  off_t header_bit_size;   <span class="comment">// calculated</span></div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="keywordtype">int</span> first_mb_in_slice;</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordtype">int</span> slice_type;</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordtype">int</span> pic_parameter_set_id;</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="keywordtype">int</span> colour_plane_id;</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  <span class="keywordtype">int</span> frame_num;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keywordtype">bool</span> field_pic_flag;</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <span class="keywordtype">bool</span> bottom_field_flag;</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordtype">int</span> idr_pic_id;</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keywordtype">int</span> pic_order_cnt_lsb;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <span class="keywordtype">int</span> delta_pic_order_cnt_bottom;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordtype">int</span> delta_pic_order_cnt[2];</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordtype">int</span> redundant_pic_cnt;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  <span class="keywordtype">bool</span> direct_spatial_mv_pred_flag;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordtype">bool</span> num_ref_idx_active_override_flag;</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l0_active_minus1;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="keywordtype">int</span> num_ref_idx_l1_active_minus1;</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l0;</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l1;</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> ref_list_l0_modifications[kRefListModSize];</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a> ref_list_l1_modifications[kRefListModSize];</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordtype">int</span> luma_log2_weight_denom;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="keywordtype">int</span> chroma_log2_weight_denom;</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordtype">bool</span> luma_weight_l0_flag;</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_l0_flag;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> pred_weight_table_l0;</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  <span class="keywordtype">bool</span> luma_weight_l1_flag;</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="keywordtype">bool</span> chroma_weight_l1_flag;</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> pred_weight_table_l1;</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  <span class="keywordtype">bool</span> no_output_of_prior_pics_flag;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <span class="keywordtype">bool</span> long_term_reference_flag;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="keywordtype">bool</span> adaptive_ref_pic_marking_mode_flag;</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <a class="code" href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">H264DecRefPicMarking</a> ref_pic_marking[kRefListSize];</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keywordtype">int</span> cabac_init_idc;</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="keywordtype">int</span> slice_qp_delta;</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="keywordtype">bool</span> sp_for_switch_flag;</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordtype">int</span> slice_qs_delta;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="keywordtype">int</span> disable_deblocking_filter_idc;</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="keywordtype">int</span> slice_alpha_c0_offset_div2;</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;  <span class="keywordtype">int</span> slice_beta_offset_div2;</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;};</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;</div>
+<div class="line"><a name="l00220"></a><span class="lineno"><a class="line" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">  220</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">H264SEIRecoveryPoint</a> {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  <span class="keywordtype">int</span> recovery_frame_cnt;</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keywordtype">bool</span> exact_match_flag;</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  <span class="keywordtype">bool</span> broken_link_flag;</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="keywordtype">int</span> changing_slice_group_idc;</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;};</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;</div>
+<div class="line"><a name="l00227"></a><span class="lineno"><a class="line" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">  227</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a> {</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  <a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a>();</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;  <span class="keyword">enum</span> Type {</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    kSEIRecoveryPoint = 6,</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;  };</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  <span class="keywordtype">int</span> type;</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordtype">int</span> payload_size;</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  <span class="keyword">union </span>{</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="comment">// Placeholder; in future more supported types will contribute to more</span></div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="comment">// union members here.</span></div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    <a class="code" href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">H264SEIRecoveryPoint</a> recovery_point;</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  };</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;};</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;<span class="comment">// Class to parse an Annex-B H.264 stream,</span></div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;<span class="comment">// as specified in chapters 7 and Annex B of the H.264 spec.</span></div>
+<div class="line"><a name="l00245"></a><span class="lineno"><a class="line" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">  245</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a> {</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  <span class="keyword">enum</span> Result {</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;    kOk,</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;    kInvalidStream,      <span class="comment">// error in stream</span></div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    kUnsupportedStream,  <span class="comment">// stream not supported by the parser</span></div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    kEOStream,           <span class="comment">// end of stream</span></div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  };</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  <a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>();</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  ~<a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>();</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  <span class="comment">// NALU-specific parsing functions.</span></div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="comment">// SPSes and PPSes are owned by the parser class and the memory for their</span></div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;  <span class="comment">// structures is managed here, not by the caller, as they are reused</span></div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="comment">// across NALUs.</span></div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  <span class="comment">//</span></div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="comment">// Parse an SPS/PPS NALU and save their data in the parser, returning id</span></div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;  <span class="comment">// of the parsed structure in |*pps_id|/|*sps_id|.</span></div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;  <span class="comment">// To get a pointer to a given SPS/PPS structure, use GetSps()/GetPps(),</span></div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;  <span class="comment">// passing the returned |*sps_id|/|*pps_id| as parameter.</span></div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;  Result ParseSps(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* sps_id);</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;  Result ParsePps(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* pps_id);</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  <span class="comment">// Return a pointer to SPS/PPS with given |sps_id|/|pps_id| or NULL if not</span></div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;  <span class="comment">// present.</span></div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* GetSps(<span class="keywordtype">int</span> sps_id);</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>* GetPps(<span class="keywordtype">int</span> pps_id);</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  <span class="comment">// Slice headers and SEI messages are not used across NALUs by the parser</span></div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;  <span class="comment">// and can be discarded after current NALU, so the parser does not store</span></div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  <span class="comment">// them, nor does it manage their memory.</span></div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  <span class="comment">// The caller has to provide and manage it instead.</span></div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;  <span class="comment">// Parse a slice header, returning it in |*shdr|. |*nalu| must be set to</span></div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;  <span class="comment">// the NALU returned from AdvanceToNextNALU() and corresponding to |*shdr|.</span></div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;  Result ParseSliceHeader(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;  <span class="comment">// Parse a SEI message, returning it in |*sei_msg|, provided and managed</span></div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;  <span class="comment">// by the caller.</span></div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  Result ParseSEI(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <a class="code" href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">H264SEIMessage</a>* sei_msg);</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <span class="comment">// Parse scaling lists (see spec).</span></div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;  Result ParseScalingList(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                          <span class="keywordtype">int</span> size,</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;                          <span class="keywordtype">int</span>* scaling_list,</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;                          <span class="keywordtype">bool</span>* use_default);</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  Result ParseSpsScalingLists(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* sps);</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  Result ParsePpsScalingLists(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;                              <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>&amp; sps,</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;                              <a class="code" href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">H264Pps</a>* pps);</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;  <span class="comment">// Parse optional VUI parameters in SPS (see spec).</span></div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  Result ParseVUIParameters(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>* sps);</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  <span class="comment">// Set |hrd_parameters_present| to true only if they are present.</span></div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  Result ParseAndIgnoreHRDParameters(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;                                     <span class="keywordtype">bool</span>* hrd_parameters_present);</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="comment">// Parse reference picture lists&#39; modifications (see spec).</span></div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  Result ParseRefPicListModifications(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;  Result ParseRefPicListModification(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;                                     <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;                                     <a class="code" href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">H264ModificationOfPicNum</a>* ref_list_mods);</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  <span class="comment">// Parse prediction weight table (see spec).</span></div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;  Result ParsePredWeightTable(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;                              <span class="keyword">const</span> <a class="code" href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a>&amp; sps,</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;                              <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  <span class="comment">// Parse weighting factors (see spec).</span></div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;  Result ParseWeightingFactors(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;                               <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;                               <span class="keywordtype">int</span> chroma_array_type,</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                               <span class="keywordtype">int</span> luma_log2_weight_denom,</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                               <span class="keywordtype">int</span> chroma_log2_weight_denom,</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;                               <a class="code" href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a>* w_facts);</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  <span class="comment">// Parse decoded reference picture marking information (see spec).</span></div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  Result ParseDecRefPicMarking(<a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br, <a class="code" href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a>* shdr);</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  <span class="comment">// PPSes and SPSes stored for future reference.</span></div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, std::unique_ptr&lt;H264Sps&gt;&gt; SpsById;</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, std::unique_ptr&lt;H264Pps&gt;&gt; PpsById;</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  SpsById active_SPSes_;</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;  PpsById active_PPSes_;</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">H264Parser</a>);</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;};</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;<span class="preprocessor">#endif  // MEDIA_CODECS_H264_PARSER_H_</span></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264SliceHeader_html"><div class="ttname"><a href="../../d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">shaka::media::H264SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00144">h264_parser.h:144</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H264Parser_html"><div class="ttname"><a href="../../d3/d91/classshaka_1_1media_1_1H264Parser.html">shaka::media::H264Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00245">h264_parser.h:245</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264SEIRecoveryPoint_html"><div class="ttname"><a href="../../df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">shaka::media::H264SEIRecoveryPoint</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00220">h264_parser.h:220</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264Pps_html"><div class="ttname"><a href="../../de/de4/structshaka_1_1media_1_1H264Pps.html">shaka::media::H264Pps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00092">h264_parser.h:92</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264Sps_html"><div class="ttname"><a href="../../d1/d0a/structshaka_1_1media_1_1H264Sps.html">shaka::media::H264Sps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00037">h264_parser.h:37</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264DecRefPicMarking_html"><div class="ttname"><a href="../../dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html">shaka::media::H264DecRefPicMarking</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00136">h264_parser.h:136</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264SEIMessage_html"><div class="ttname"><a href="../../d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html">shaka::media::H264SEIMessage</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00227">h264_parser.h:227</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264ModificationOfPicNum_html"><div class="ttname"><a href="../../d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html">shaka::media::H264ModificationOfPicNum</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00119">h264_parser.h:119</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">shaka::media::Nalu</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00026">nalu_reader.h:26</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H26xBitReader_html"><div class="ttname"><a href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">shaka::media::H26xBitReader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/dc2/h26x__bit__reader_8h_source.html#l00022">h26x_bit_reader.h:22</a></div></div>
-<div class="ttc" id="structshaka_1_1media_1_1H264WeightingFactors_html"><div class="ttname"><a href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">shaka::media::H264WeightingFactors</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00126">h264_parser.h:126</a></div></div>
+<div class="ttc" id="structshaka_1_1media_1_1H264WeightingFactors_html"><div class="ttname"><a href="../../d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">shaka::media::H264WeightingFactors</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d9b/h264__parser_8h_source.html#l00127">h264_parser.h:127</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/d9f/hls__flags_8cc_source.html b/docs/d6/d9f/hls__flags_8cc_source.html
index 943749244a..239c498d5a 100644
--- a/docs/d6/d9f/hls__flags_8cc_source.html
+++ b/docs/d6/d9f/hls__flags_8cc_source.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/da0/ts__section__pat_8h_source.html b/docs/d6/da0/ts__section__pat_8h_source.html
index f29cc17ccc..09cc75822b 100644
--- a/docs/d6/da0/ts__section__pat_8h_source.html
+++ b/docs/d6/da0/ts__section__pat_8h_source.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/da3/mpd__builder_8h_source.html b/docs/d6/da3/mpd__builder_8h_source.html
index c5b5fb1b1b..8a7ed7b0a5 100644
--- a/docs/d6/da3/mpd__builder_8h_source.html
+++ b/docs/d6/da3/mpd__builder_8h_source.html
@@ -111,430 +111,427 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;packager/base/atomic_sequence_num.h&quot;</span></div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;packager/base/gtest_prod_util.h&quot;</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/clock.h&quot;</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/time.h&quot;</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/bandwidth_estimator.h&quot;</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/content_protection_element.h&quot;</span></div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_options.h&quot;</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/segment_info.h&quot;</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/xml/scoped_xml_ptr.h&quot;</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="comment">// TODO(rkuroiwa): For classes with |id_|, consider removing the field and let</span></div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="comment">// the MPD (XML) generation functions take care of assigning an ID to each</span></div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="comment">// element.</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="keyword">class </span>File;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keyword">class </span>AdaptationSet;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="keyword">class </span>Representation;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="keyword">namespace </span>xml {</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="keyword">class </span>XmlNode;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keyword">class </span>RepresentationXmlNode;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;}  <span class="comment">// namespace xml</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
-<div class="line"><a name="l00058"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html">   58</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a> {</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keyword">enum</span> MpdType {</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    kStatic = 0,</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    kDynamic</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  };</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">MpdBuilder</a>(MpdType <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a>, <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options);</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>();</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">AddBaseUrl</a>(<span class="keyword">const</span> std::string&amp; base_url);</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">AddAdaptationSet</a>(<span class="keyword">const</span> std::string&amp; lang);</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">WriteMpdToFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">media::File</a>* output_file);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">ToString</a>(std::string* output);</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">   93</a></span>&#160;  MpdType <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> type_; }</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MakePathsRelativeToMpd</a>(<span class="keyword">const</span> std::string&amp; mpd_path,</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;                                     MediaInfo* media_info);</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="comment">// Inject a |clock| that returns the current time.</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">  105</a></span>&#160;<span class="comment"></span>  <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a>(std::unique_ptr&lt;base::Clock&gt; clock) {</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    clock_ = std::move(clock);</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  }</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="comment">// DynamicMpdBuilderTest needs to set availabilityStartTime so that the test</span></div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="comment">// doesn&#39;t need to depend on current time.</span></div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>DynamicMpdBuilderTest;</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="keywordtype">bool</span> ToStringImpl(std::string* output);</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="comment">// This is a helper method for writing out MPDs, called from WriteMpdToFile()</span></div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="comment">// and ToString().</span></div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keyword">template</span> &lt;<span class="keyword">typename</span> OutputType&gt;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keywordtype">bool</span> WriteMpdToOutput(OutputType* output);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="comment">// Returns the document pointer to the MPD. This must be freed by the caller</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <span class="comment">// using appropriate xmlDocPtr freeing function.</span></div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  <span class="comment">// On failure, this returns NULL.</span></div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  xmlDocPtr GenerateMpd();</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <span class="comment">// Set MPD attributes common to all profiles. Uses non-zero |mpd_options_| to</span></div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="comment">// set attributes for the MPD.</span></div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordtype">void</span> AddCommonMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="comment">// Adds &#39;static&#39; MPD attributes and elements to |mpd_node|. This assumes that</span></div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="comment">// the first child element is a Period element.</span></div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  <span class="keywordtype">void</span> AddStaticMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="comment">// Same as AddStaticMpdInfo() but for &#39;dynamic&#39; MPDs.</span></div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  <span class="keywordtype">void</span> AddDynamicMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordtype">float</span> GetStaticMpdDuration(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="comment">// Set MPD attributes for dynamic profile MPD. Uses non-zero |mpd_options_| as</span></div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="comment">// well as various calculations to set attributes for the MPD.</span></div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordtype">void</span> SetDynamicMpdAttributes(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  MpdType type_;</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> mpd_options_;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  std::list&lt;AdaptationSet*&gt; adaptation_sets_;</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  STLElementDeleter&lt;std::list&lt;AdaptationSet*&gt; &gt; adaptation_sets_deleter_;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  std::list&lt;std::string&gt; base_urls_;</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  std::string availability_start_time_;</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  base::AtomicSequenceNumber adaptation_set_counter_;</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  base::AtomicSequenceNumber representation_counter_;</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  <span class="comment">// By default, this returns the current time. This can be injected for</span></div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="comment">// testing.</span></div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  std::unique_ptr&lt;base::Clock&gt; clock_;</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>);</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;};</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
-<div class="line"><a name="l00167"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">  167</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> {</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="comment">// The role for this AdaptationSet. These values are used to add a Role</span></div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  <span class="comment">// element to the AdaptationSet with schemeIdUri=urn:mpeg:dash:role:2011.</span></div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="comment">// See ISO/IEC 23009-1:2012 section 5.8.5.5.</span></div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="keyword">enum</span> Role {</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    kRoleCaption,</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    kRoleSubtitle,</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    kRoleMain,</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    kRoleAlternate,</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    kRoleSupplementary,</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    kRoleCommentary,</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    kRoleDub</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  };</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/clock.h&quot;</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/time.h&quot;</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/bandwidth_estimator.h&quot;</span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/content_protection_element.h&quot;</span></div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_options.h&quot;</span></div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/segment_info.h&quot;</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/xml/scoped_xml_ptr.h&quot;</span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="comment">// TODO(rkuroiwa): For classes with |id_|, consider removing the field and let</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="comment">// the MPD (XML) generation functions take care of assigning an ID to each</span></div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="comment">// element.</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">class </span>File;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="keyword">class </span>AdaptationSet;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keyword">class </span>Representation;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="keyword">namespace </span>xml {</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="keyword">class </span>XmlNode;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="keyword">class </span>RepresentationXmlNode;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}  <span class="comment">// namespace xml</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
+<div class="line"><a name="l00057"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html">   57</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a> {</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keyword">enum</span> MpdType {</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    kStatic = 0,</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    kDynamic</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  };</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">MpdBuilder</a>(MpdType <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a>, <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options);</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>();</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">AddBaseUrl</a>(<span class="keyword">const</span> std::string&amp; base_url);</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">AddAdaptationSet</a>(<span class="keyword">const</span> std::string&amp; lang);</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">WriteMpdToFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">media::File</a>* output_file);</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">ToString</a>(std::string* output);</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">   92</a></span>&#160;  MpdType <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> type_; }</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MakePathsRelativeToMpd</a>(<span class="keyword">const</span> std::string&amp; mpd_path,</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;                                     MediaInfo* media_info);</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="comment">// Inject a |clock| that returns the current time.</span></div>
+<div class="line"><a name="l00104"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">  104</a></span>&#160;<span class="comment"></span>  <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a>(std::unique_ptr&lt;base::Clock&gt; clock) {</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    clock_ = std::move(clock);</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  }</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="comment">// DynamicMpdBuilderTest needs to set availabilityStartTime so that the test</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="comment">// doesn&#39;t need to depend on current time.</span></div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>DynamicMpdBuilderTest;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordtype">bool</span> ToStringImpl(std::string* output);</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="comment">// This is a helper method for writing out MPDs, called from WriteMpdToFile()</span></div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <span class="comment">// and ToString().</span></div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="keyword">template</span> &lt;<span class="keyword">typename</span> OutputType&gt;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keywordtype">bool</span> WriteMpdToOutput(OutputType* output);</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="comment">// Returns the document pointer to the MPD. This must be freed by the caller</span></div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="comment">// using appropriate xmlDocPtr freeing function.</span></div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <span class="comment">// On failure, this returns NULL.</span></div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  xmlDocPtr GenerateMpd();</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="comment">// Set MPD attributes common to all profiles. Uses non-zero |mpd_options_| to</span></div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <span class="comment">// set attributes for the MPD.</span></div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="keywordtype">void</span> AddCommonMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  <span class="comment">// Adds &#39;static&#39; MPD attributes and elements to |mpd_node|. This assumes that</span></div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="comment">// the first child element is a Period element.</span></div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordtype">void</span> AddStaticMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  <span class="comment">// Same as AddStaticMpdInfo() but for &#39;dynamic&#39; MPDs.</span></div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="keywordtype">void</span> AddDynamicMpdInfo(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  <span class="keywordtype">float</span> GetStaticMpdDuration(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="comment">// Set MPD attributes for dynamic profile MPD. Uses non-zero |mpd_options_| as</span></div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="comment">// well as various calculations to set attributes for the MPD.</span></div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordtype">void</span> SetDynamicMpdAttributes(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">xml::XmlNode</a>* mpd_node);</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  MpdType type_;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> mpd_options_;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  std::list&lt;std::unique_ptr&lt;AdaptationSet&gt;&gt; adaptation_sets_;</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  std::list&lt;std::string&gt; base_urls_;</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  std::string availability_start_time_;</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  base::AtomicSequenceNumber adaptation_set_counter_;</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  base::AtomicSequenceNumber representation_counter_;</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  <span class="comment">// By default, this returns the current time. This can be injected for</span></div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  <span class="comment">// testing.</span></div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  std::unique_ptr&lt;base::Clock&gt; clock_;</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>);</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;};</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;</div>
+<div class="line"><a name="l00165"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">  165</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> {</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="comment">// The role for this AdaptationSet. These values are used to add a Role</span></div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="comment">// element to the AdaptationSet with schemeIdUri=urn:mpeg:dash:role:2011.</span></div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="comment">// See ISO/IEC 23009-1:2012 section 5.8.5.5.</span></div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  <span class="keyword">enum</span> Role {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    kRoleCaption,</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    kRoleSubtitle,</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    kRoleMain,</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    kRoleAlternate,</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    kRoleSupplementary,</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    kRoleCommentary,</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    kRoleDub</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  };</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>();</div>
 <div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>();</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AddRepresentation</a>(<span class="keyword">const</span> MediaInfo&amp; media_info);</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; element);</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;                                           <span class="keyword">const</span> std::string&amp; pssh);</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">AddRole</a>(Role role);</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">GetXml</a>();</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">ForceSetSegmentAlignment</a>(<span class="keywordtype">bool</span> segment_alignment);</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">SetGroup</a>(<span class="keywordtype">int</span> group_number);</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">int</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">Group</a>() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  <span class="comment">// Must be unique in the Period.</span></div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  uint32_t id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> id_; }</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">OnNewSegmentForRepresentation</a>(uint32_t representation_id,</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;                                     uint64_t start_time,</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;                                     uint64_t duration);</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">OnSetFrameRateForRepresentation</a>(uint32_t representation_id,</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;                                       uint32_t frame_duration,</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;                                       uint32_t timescale);</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160; <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">AdaptationSet</a>(uint32_t adaptation_set_id,</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;                <span class="keyword">const</span> std::string&amp; lang,</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;                MpdBuilder::MpdType mpd_type,</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;                base::AtomicSequenceNumber* representation_counter);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>;</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;  <span class="keyword">template</span> &lt;MpdBuilder::MpdType type&gt;</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>MpdBuilderTest;</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  <span class="comment">// kSegmentAlignmentUnknown means that it is uncertain if the</span></div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  <span class="comment">// (sub)segments are aligned or not.</span></div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <span class="comment">// kSegmentAlignmentTrue means that it is certain that the all the (current)</span></div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  <span class="comment">// segments added to the adaptation set are aligned.</span></div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;  <span class="comment">// kSegmentAlignmentFalse means that it is it is certain that some segments</span></div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="comment">// are not aligned. This is useful to disable the computation for</span></div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  <span class="comment">// segment alignment, once it is certain that some segments are not aligned.</span></div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;  <span class="keyword">enum</span> SegmentAligmentStatus {</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;    kSegmentAlignmentUnknown,</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    kSegmentAlignmentTrue,</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;    kSegmentAlignmentFalse</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  };</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;  <span class="comment">// This maps Representations (IDs) to a list of start times of the segments.</span></div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  <span class="comment">// e.g.</span></div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  <span class="comment">// If Representation 1 has start time 0, 100, 200 and Representation 2 has</span></div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  <span class="comment">// start times 0, 200, 400, then the map contains:</span></div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;  <span class="comment">// 1 -&gt; [0, 100, 200]</span></div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;  <span class="comment">// 2 -&gt; [0, 200, 400]</span></div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  <span class="keyword">typedef</span> std::map&lt;uint32_t, std::list&lt;uint64_t&gt; &gt; RepresentationTimeline;</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;  <span class="keywordtype">void</span> CheckLiveSegmentAlignment(uint32_t representation_id,</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;                                 uint64_t start_time,</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;                                 uint64_t duration);</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  <span class="comment">// Checks representation_segment_start_times_ and sets segments_aligned_.</span></div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;  <span class="comment">// Use this for VOD, do not use for Live.</span></div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;  <span class="keywordtype">void</span> CheckVodSegmentAlignment();</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  <span class="comment">// Records the framerate of a Representation.</span></div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  <span class="keywordtype">void</span> RecordFrameRate(uint32_t frame_duration, uint32_t timescale);</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;  std::list&lt;ContentProtectionElement&gt; content_protection_elements_;</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  std::list&lt;Representation*&gt; representations_;</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  STLElementDeleter&lt;std::list&lt;Representation*&gt; &gt; representations_deleter_;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  base::AtomicSequenceNumber* <span class="keyword">const</span> representation_counter_;</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  <span class="keyword">const</span> uint32_t id_;</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  <span class="keyword">const</span> std::string lang_;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options_;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  <span class="keyword">const</span> MpdBuilder::MpdType mpd_type_;</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;  <span class="comment">// The group attribute for the AdaptationSet. If the value is negative,</span></div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="comment">// no group number is specified.</span></div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="comment">// Note that group 0 is a special group number.</span></div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="keywordtype">int</span> group_;</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;  <span class="comment">// Video widths and heights of Representations. Note that this is a set; if</span></div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  <span class="comment">// there is only 1 resolution, then @width &amp; @height should be set, otherwise</span></div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;  <span class="comment">// @maxWidth &amp; @maxHeight should be set for DASH IOP.</span></div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  std::set&lt;uint32_t&gt; video_widths_;</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;  std::set&lt;uint32_t&gt; video_heights_;</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  <span class="comment">// Video representations&#39; frame rates.</span></div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  <span class="comment">// The frame rate notation for MPD is &lt;integer&gt;/&lt;integer&gt; (where the</span></div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;  <span class="comment">// denominator is optional). This means the frame rate could be non-whole</span></div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;  <span class="comment">// rational value, therefore the key is of type double.</span></div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;  <span class="comment">// Value is &lt;integer&gt;/&lt;integer&gt; in string form.</span></div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;  <span class="comment">// So, key == CalculatedValue(value)</span></div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;  std::map&lt;double, std::string&gt; video_frame_rates_;</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;  <span class="comment">// contentType attribute of AdaptationSet.</span></div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;  <span class="comment">// Determined by examining the MediaInfo passed to AddRepresentation().</span></div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  std::string content_type_;</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;  <span class="comment">// This does not have to be a set, it could be a list or vector because all we</span></div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;  <span class="comment">// really care is whether there is more than one entry.</span></div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;  <span class="comment">// Contains one entry if all the Representations have the same picture aspect</span></div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;  <span class="comment">// ratio (@par attribute for AdaptationSet).</span></div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;  <span class="comment">// There will be more than one entry if there are multiple picture aspect</span></div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;  <span class="comment">// ratios.</span></div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;  <span class="comment">// The @par attribute should only be set if there is exactly one entry</span></div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;  <span class="comment">// in this set.</span></div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;  std::set&lt;std::string&gt; picture_aspect_ratio_;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AddRepresentation</a>(<span class="keyword">const</span> MediaInfo&amp; media_info);</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; element);</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;                                           <span class="keyword">const</span> std::string&amp; pssh);</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">AddRole</a>(Role role);</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">GetXml</a>();</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">ForceSetSegmentAlignment</a>(<span class="keywordtype">bool</span> segment_alignment);</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">SetGroup</a>(<span class="keywordtype">int</span> group_number);</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">int</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">Group</a>() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  <span class="comment">// Must be unique in the Period.</span></div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  uint32_t id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> id_; }</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">OnNewSegmentForRepresentation</a>(uint32_t representation_id,</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;                                     uint64_t start_time,</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;                                     uint64_t duration);</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">OnSetFrameRateForRepresentation</a>(uint32_t representation_id,</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;                                       uint32_t frame_duration,</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;                                       uint32_t timescale);</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160; <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">AdaptationSet</a>(uint32_t adaptation_set_id,</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;                <span class="keyword">const</span> std::string&amp; lang,</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;                <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;                MpdBuilder::MpdType mpd_type,</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                base::AtomicSequenceNumber* representation_counter);</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html">MpdBuilder</a>;</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keyword">template</span> &lt;MpdBuilder::MpdType type&gt;</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>MpdBuilderTest;</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;  <span class="comment">// kSegmentAlignmentUnknown means that it is uncertain if the</span></div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;  <span class="comment">// (sub)segments are aligned or not.</span></div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  <span class="comment">// kSegmentAlignmentTrue means that it is certain that the all the (current)</span></div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  <span class="comment">// segments added to the adaptation set are aligned.</span></div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <span class="comment">// kSegmentAlignmentFalse means that it is it is certain that some segments</span></div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  <span class="comment">// are not aligned. This is useful to disable the computation for</span></div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;  <span class="comment">// segment alignment, once it is certain that some segments are not aligned.</span></div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="keyword">enum</span> SegmentAligmentStatus {</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;    kSegmentAlignmentUnknown,</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;    kSegmentAlignmentTrue,</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;    kSegmentAlignmentFalse</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;  };</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  <span class="comment">// This maps Representations (IDs) to a list of start times of the segments.</span></div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;  <span class="comment">// e.g.</span></div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;  <span class="comment">// If Representation 1 has start time 0, 100, 200 and Representation 2 has</span></div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  <span class="comment">// start times 0, 200, 400, then the map contains:</span></div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  <span class="comment">// 1 -&gt; [0, 100, 200]</span></div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  <span class="comment">// 2 -&gt; [0, 200, 400]</span></div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;  <span class="keyword">typedef</span> std::map&lt;uint32_t, std::list&lt;uint64_t&gt; &gt; RepresentationTimeline;</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  <span class="keywordtype">void</span> CheckLiveSegmentAlignment(uint32_t representation_id,</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;                                 uint64_t start_time,</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;                                 uint64_t duration);</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  <span class="comment">// Checks representation_segment_start_times_ and sets segments_aligned_.</span></div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  <span class="comment">// Use this for VOD, do not use for Live.</span></div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  <span class="keywordtype">void</span> CheckVodSegmentAlignment();</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;  <span class="comment">// Records the framerate of a Representation.</span></div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;  <span class="keywordtype">void</span> RecordFrameRate(uint32_t frame_duration, uint32_t timescale);</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  std::list&lt;ContentProtectionElement&gt; content_protection_elements_;</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;  std::list&lt;std::unique_ptr&lt;Representation&gt;&gt; representations_;</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  base::AtomicSequenceNumber* <span class="keyword">const</span> representation_counter_;</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keyword">const</span> uint32_t id_;</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  <span class="keyword">const</span> std::string lang_;</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options_;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  <span class="keyword">const</span> MpdBuilder::MpdType mpd_type_;</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  <span class="comment">// The group attribute for the AdaptationSet. If the value is negative,</span></div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  <span class="comment">// no group number is specified.</span></div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;  <span class="comment">// Note that group 0 is a special group number.</span></div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;  <span class="keywordtype">int</span> group_;</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="comment">// Video widths and heights of Representations. Note that this is a set; if</span></div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="comment">// there is only 1 resolution, then @width &amp; @height should be set, otherwise</span></div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;  <span class="comment">// @maxWidth &amp; @maxHeight should be set for DASH IOP.</span></div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;  std::set&lt;uint32_t&gt; video_widths_;</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  std::set&lt;uint32_t&gt; video_heights_;</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  <span class="comment">// Video representations&#39; frame rates.</span></div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;  <span class="comment">// The frame rate notation for MPD is &lt;integer&gt;/&lt;integer&gt; (where the</span></div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;  <span class="comment">// denominator is optional). This means the frame rate could be non-whole</span></div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  <span class="comment">// rational value, therefore the key is of type double.</span></div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  <span class="comment">// Value is &lt;integer&gt;/&lt;integer&gt; in string form.</span></div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;  <span class="comment">// So, key == CalculatedValue(value)</span></div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;  std::map&lt;double, std::string&gt; video_frame_rates_;</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;  <span class="comment">// contentType attribute of AdaptationSet.</span></div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;  <span class="comment">// Determined by examining the MediaInfo passed to AddRepresentation().</span></div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;  std::string content_type_;</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;  <span class="comment">// This does not have to be a set, it could be a list or vector because all we</span></div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  <span class="comment">// really care is whether there is more than one entry.</span></div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;  <span class="comment">// Contains one entry if all the Representations have the same picture aspect</span></div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;  <span class="comment">// ratio (@par attribute for AdaptationSet).</span></div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;  <span class="comment">// There will be more than one entry if there are multiple picture aspect</span></div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;  <span class="comment">// ratios.</span></div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;  <span class="comment">// The @par attribute should only be set if there is exactly one entry</span></div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;  <span class="comment">// in this set.</span></div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;  std::set&lt;std::string&gt; picture_aspect_ratio_;</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;  <span class="comment">// The roles of this AdaptationSet.</span></div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;  std::set&lt;Role&gt; roles_;</div>
 <div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;  <span class="comment">// The roles of this AdaptationSet.</span></div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;  std::set&lt;Role&gt; roles_;</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;  <span class="comment">// True iff all the segments are aligned.</span></div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  SegmentAligmentStatus segments_aligned_;</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="keywordtype">bool</span> force_set_segment_alignment_;</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;  <span class="comment">// Keeps track of segment start times of Representations.</span></div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="comment">// For VOD, this will not be cleared, all the segment start times are</span></div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="comment">// stored in this. This should not out-of-memory for a reasonable length</span></div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  <span class="comment">// video and reasonable subsegment length.</span></div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  <span class="comment">// For Live, the entries are deleted (see CheckLiveSegmentAlignment()</span></div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;  <span class="comment">// implementation comment) because storing the entire timeline is not</span></div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  <span class="comment">// reasonable and may cause an out-of-memory problem.</span></div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  RepresentationTimeline representation_segment_start_times_;</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;  <span class="comment">// True iff all the segments are aligned.</span></div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;  SegmentAligmentStatus segments_aligned_;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;  <span class="keywordtype">bool</span> force_set_segment_alignment_;</div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  <span class="comment">// Keeps track of segment start times of Representations.</span></div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="comment">// For VOD, this will not be cleared, all the segment start times are</span></div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  <span class="comment">// stored in this. This should not out-of-memory for a reasonable length</span></div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;  <span class="comment">// video and reasonable subsegment length.</span></div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  <span class="comment">// For Live, the entries are deleted (see CheckLiveSegmentAlignment()</span></div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="comment">// implementation comment) because storing the entire timeline is not</span></div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  <span class="comment">// reasonable and may cause an out-of-memory problem.</span></div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  RepresentationTimeline representation_segment_start_times_;</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;</div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>);</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;};</div>
 <div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>);</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;};</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;</div>
-<div class="line"><a name="l00406"></a><span class="lineno"><a class="line" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">  406</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> {</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a>() {}</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a>() {}</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a2fc3088977c82cab3bac96be10c7c117">OnNewSegmentForRepresentation</a>(uint64_t start_time,</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;                                             uint64_t duration) = 0;</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a64bc6f8299a1479c85f294f8ab3f6819">OnSetFrameRateForRepresentation</a>(uint32_t frame_duration,</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;                                               uint32_t timescale) = 0;</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;};</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;</div>
-<div class="line"><a name="l00428"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html">  428</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a> {</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  <span class="keyword">enum</span> SuppressFlag {</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;    kSuppressWidth = 1,</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;    kSuppressHeight = 2,</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;    kSuppressFrameRate = 4,</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;  };</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>();</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;</div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">Init</a>();</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; element);</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;                                           <span class="keyword">const</span> std::string&amp; pssh);</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">AddNewSegment</a>(uint64_t start_time,</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;                             uint64_t duration,</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;                             uint64_t size);</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">SetSampleDuration</a>(uint32_t sample_duration);</div>
+<div class="line"><a name="l00403"></a><span class="lineno"><a class="line" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">  403</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> {</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a>() {}</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a>() {}</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a2fc3088977c82cab3bac96be10c7c117">OnNewSegmentForRepresentation</a>(uint64_t start_time,</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;                                             uint64_t duration) = 0;</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a64bc6f8299a1479c85f294f8ab3f6819">OnSetFrameRateForRepresentation</a>(uint32_t frame_duration,</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;                                               uint32_t timescale) = 0;</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;};</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;</div>
+<div class="line"><a name="l00425"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html">  425</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a> {</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;  <span class="keyword">enum</span> SuppressFlag {</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;    kSuppressWidth = 1,</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;    kSuppressHeight = 2,</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;    kSuppressFrameRate = 4,</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;  };</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>();</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">Init</a>();</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; element);</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;                                           <span class="keyword">const</span> std::string&amp; pssh);</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">AddNewSegment</a>(uint64_t start_time,</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;                             uint64_t duration,</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;                             uint64_t size);</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;</div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">SetSampleDuration</a>(uint32_t sample_duration);</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml</a>();</div>
 <div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;  xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml</a>();</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">SuppressOnce</a>(SuppressFlag flag);</div>
+<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">SuppressOnce</a>(SuppressFlag flag);</div>
+<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;</div>
+<div class="line"><a name="l00500"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">  500</a></span>&#160;  uint32_t <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> id_; }</div>
 <div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;</div>
-<div class="line"><a name="l00503"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">  503</a></span>&#160;  uint32_t <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> id_; }</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160; <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a>(</div>
-<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;      <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;      uint32_t representation_id,</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;      std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener);</div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>;</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;  <span class="keyword">template</span> &lt;MpdBuilder::MpdType type&gt;</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>MpdBuilderTest;</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  <span class="keywordtype">bool</span> AddLiveInfo(<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">xml::RepresentationXmlNode</a>* representation);</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;</div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;  <span class="comment">// Returns true if |media_info_| has required fields to generate a valid</span></div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  <span class="comment">// Representation. Otherwise returns false.</span></div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  <span class="keywordtype">bool</span> HasRequiredMediaInfoFields();</div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  <span class="comment">// Return false if the segment should be considered a new segment. True if the</span></div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  <span class="comment">// segment is contiguous.</span></div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;  <span class="keywordtype">bool</span> IsContiguous(uint64_t start_time,</div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;                    uint64_t duration,</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;                    uint64_t size) <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  <span class="comment">// Remove elements from |segment_infos_| if</span></div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  <span class="comment">// mpd_options_.time_shift_buffer_depth is specified. Increments</span></div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  <span class="comment">// |start_number_| by the number of segments removed.</span></div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  <span class="keywordtype">void</span> SlideWindow();</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;</div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;  <span class="comment">// Note: Because &#39;mimeType&#39; is a required field for a valid MPD, these return</span></div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  <span class="comment">// strings.</span></div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  std::string GetVideoMimeType() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  std::string GetAudioMimeType() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  std::string GetTextMimeType() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  <span class="comment">// Init() checks that only one of VideoInfo, AudioInfo, or TextInfo is set. So</span></div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;  <span class="comment">// any logic using this can assume only one set.</span></div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  MediaInfo media_info_;</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  std::list&lt;ContentProtectionElement&gt; content_protection_elements_;</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;  std::list&lt;SegmentInfo&gt; segment_infos_;</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  <span class="keyword">const</span> uint32_t id_;</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  std::string mime_type_;</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  std::string codecs_;</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  <a class="code" href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a> bandwidth_estimator_;</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options_;</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;  <span class="comment">// startNumber attribute for SegmentTemplate.</span></div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;  <span class="comment">// Starts from 1.</span></div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;  uint32_t start_number_;</div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;</div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;  <span class="comment">// If this is not null, then Representation is responsible for calling the</span></div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  <span class="comment">// right methods at right timings.</span></div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;  std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener_;</div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160; <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a>(</div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;      <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;      uint32_t representation_id,</div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;      std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener);</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;</div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>;</div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  <span class="keyword">template</span> &lt;MpdBuilder::MpdType type&gt;</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>MpdBuilderTest;</div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;</div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;  <span class="keywordtype">bool</span> AddLiveInfo(<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">xml::RepresentationXmlNode</a>* representation);</div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;</div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  <span class="comment">// Returns true if |media_info_| has required fields to generate a valid</span></div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  <span class="comment">// Representation. Otherwise returns false.</span></div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;  <span class="keywordtype">bool</span> HasRequiredMediaInfoFields();</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;</div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  <span class="comment">// Return false if the segment should be considered a new segment. True if the</span></div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  <span class="comment">// segment is contiguous.</span></div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  <span class="keywordtype">bool</span> IsContiguous(uint64_t start_time,</div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;                    uint64_t duration,</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;                    uint64_t size) <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;</div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  <span class="comment">// Remove elements from |segment_infos_| if</span></div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  <span class="comment">// mpd_options_.time_shift_buffer_depth is specified. Increments</span></div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;  <span class="comment">// |start_number_| by the number of segments removed.</span></div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  <span class="keywordtype">void</span> SlideWindow();</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  <span class="comment">// Note: Because &#39;mimeType&#39; is a required field for a valid MPD, these return</span></div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  <span class="comment">// strings.</span></div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;  std::string GetVideoMimeType() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;  std::string GetAudioMimeType() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  std::string GetTextMimeType() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  <span class="comment">// Gets the earliest, normalized segment timestamp. Returns true if</span></div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  <span class="comment">// successful, false otherwise.</span></div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  <span class="keywordtype">bool</span> GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds);</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  <span class="comment">// Init() checks that only one of VideoInfo, AudioInfo, or TextInfo is set. So</span></div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  <span class="comment">// any logic using this can assume only one set.</span></div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;  MediaInfo media_info_;</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  std::list&lt;ContentProtectionElement&gt; content_protection_elements_;</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;  std::list&lt;SegmentInfo&gt; segment_infos_;</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  <span class="keyword">const</span> uint32_t id_;</div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;  std::string mime_type_;</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;  std::string codecs_;</div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  <a class="code" href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a> bandwidth_estimator_;</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options_;</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  <span class="comment">// startNumber attribute for SegmentTemplate.</span></div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  <span class="comment">// Starts from 1.</span></div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;  uint32_t start_number_;</div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;</div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;  <span class="comment">// If this is not null, then Representation is responsible for calling the</span></div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;  <span class="comment">// right methods at right timings.</span></div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;  std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener_;</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;</div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  <span class="comment">// Bit vector for tracking witch attributes should not be output.</span></div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;  <span class="keywordtype">int</span> output_suppression_flags_;</div>
 <div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;</div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;  <span class="comment">// Bit vector for tracking witch attributes should not be output.</span></div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;  <span class="keywordtype">int</span> output_suppression_flags_;</div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>);</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;};</div>
 <div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;</div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>);</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;};</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_MPD_BUILDER_H_</span></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a37904780833b552b7f95f124ffd10456"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">shaka::AdaptationSet::OnSetFrameRateForRepresentation</a></div><div class="ttdeci">void OnSetFrameRateForRepresentation(uint32_t representation_id, uint32_t frame_duration, uint32_t timescale)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00868">mpd_builder.cc:868</a></div></div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_MPD_BUILDER_H_</span></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a37904780833b552b7f95f124ffd10456"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">shaka::AdaptationSet::OnSetFrameRateForRepresentation</a></div><div class="ttdeci">void OnSetFrameRateForRepresentation(uint32_t representation_id, uint32_t frame_duration, uint32_t timescale)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00865">mpd_builder.cc:865</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">shaka::xml::RepresentationXmlNode</a></div><div class="ttdoc">RepresentationType in MPD. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00129">xml_node.h:129</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01104">mpd_builder.cc:1104</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01100">mpd_builder.cc:1100</a></div></div>
 <div class="ttc" id="classshaka_1_1RepresentationStateChangeListener_html_a64bc6f8299a1479c85f294f8ab3f6819"><div class="ttname"><a href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a64bc6f8299a1479c85f294f8ab3f6819">shaka::RepresentationStateChangeListener::OnSetFrameRateForRepresentation</a></div><div class="ttdeci">virtual void OnSetFrameRateForRepresentation(uint32_t frame_duration, uint32_t timescale)=0</div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_ae998409ae94f3ba12909a96e8f3f4f7e"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">shaka::Representation::Init</a></div><div class="ttdeci">bool Init()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01050">mpd_builder.cc:1050</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a35685a28f837c397e1f862d44b2205d9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">shaka::MpdBuilder::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(media::File *output_file)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00423">mpd_builder.cc:423</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a997138fcaa5deef5151a64a2d7ce6aeb"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01035">mpd_builder.cc:1035</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_acd24d0537c3625d709b58cf9565d8fcf"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">shaka::AdaptationSet::AdaptationSet</a></div><div class="ttdeci">AdaptationSet(uint32_t adaptation_set_id, const std::string &amp;lang, const MpdOptions &amp;mpd_options, MpdBuilder::MpdType mpd_type, base::AtomicSequenceNumber *representation_counter)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00674">mpd_builder.cc:674</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01128">mpd_builder.cc:1128</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00693">mpd_builder.cc:693</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00058">mpd_builder.h:58</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00503">mpd_builder.h:503</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_ae998409ae94f3ba12909a96e8f3f4f7e"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">shaka::Representation::Init</a></div><div class="ttdeci">bool Init()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01046">mpd_builder.cc:1046</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a35685a28f837c397e1f862d44b2205d9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">shaka::MpdBuilder::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(media::File *output_file)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00422">mpd_builder.cc:422</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a997138fcaa5deef5151a64a2d7ce6aeb"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01031">mpd_builder.cc:1031</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_acd24d0537c3625d709b58cf9565d8fcf"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">shaka::AdaptationSet::AdaptationSet</a></div><div class="ttdeci">AdaptationSet(uint32_t adaptation_set_id, const std::string &amp;lang, const MpdOptions &amp;mpd_options, MpdBuilder::MpdType mpd_type, base::AtomicSequenceNumber *representation_counter)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00671">mpd_builder.cc:671</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01124">mpd_builder.cc:1124</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00689">mpd_builder.cc:689</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00057">mpd_builder.h:57</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00500">mpd_builder.h:500</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">shaka::xml::XmlNode</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00032">xml_node.h:32</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html">shaka::media::File</a></div><div class="ttdoc">Define an abstract file interface. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d4d/file_8h_source.html#l00024">file.h:24</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00737">mpd_builder.cc:737</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00733">mpd_builder.cc:733</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00749">mpd_builder.cc:749</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_ab6fd968035d1cba5060fe23a107f8bdb"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">shaka::MpdBuilder::AddBaseUrl</a></div><div class="ttdeci">void AddBaseUrl(const std::string &amp;base_url)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00409">mpd_builder.cc:409</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00743">mpd_builder.cc:743</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_adf8a48afbb29f1f1c54e4daaebb81337"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">shaka::MpdBuilder::type</a></div><div class="ttdeci">MpdType type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00093">mpd_builder.h:93</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00842">mpd_builder.cc:842</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a606afa5df6a90f49faad0ce427b7e960"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">shaka::Representation::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01144">mpd_builder.cc:1144</a></div></div>
-<div class="ttc" id="classshaka_1_1RepresentationStateChangeListener_html"><div class="ttname"><a href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">shaka::RepresentationStateChangeListener</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00406">mpd_builder.h:406</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00428">mpd_builder.cc:428</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00836">mpd_builder.cc:836</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00646">mpd_builder.cc:646</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00745">mpd_builder.cc:745</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_ab6fd968035d1cba5060fe23a107f8bdb"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">shaka::MpdBuilder::AddBaseUrl</a></div><div class="ttdeci">void AddBaseUrl(const std::string &amp;base_url)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00408">mpd_builder.cc:408</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00739">mpd_builder.cc:739</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_adf8a48afbb29f1f1c54e4daaebb81337"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">shaka::MpdBuilder::type</a></div><div class="ttdeci">MpdType type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00092">mpd_builder.h:92</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00839">mpd_builder.cc:839</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a606afa5df6a90f49faad0ce427b7e960"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">shaka::Representation::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01140">mpd_builder.cc:1140</a></div></div>
+<div class="ttc" id="classshaka_1_1RepresentationStateChangeListener_html"><div class="ttname"><a href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">shaka::RepresentationStateChangeListener</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00403">mpd_builder.h:403</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00427">mpd_builder.cc:427</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00833">mpd_builder.cc:833</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00643">mpd_builder.cc:643</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdBuilder_html_ad22c1e62affefcb33382c9480820c032"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">shaka::MpdBuilder::MpdBuilder</a></div><div class="ttdeci">MpdBuilder(MpdType type, const MpdOptions &amp;mpd_options)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00401">mpd_builder.cc:401</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_af988e3a6d8b0d3ede66e3f3aea992d5e"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">shaka::AdaptationSet::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00759">mpd_builder.cc:759</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01092">mpd_builder.cc:1092</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00413">mpd_builder.cc:413</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00846">mpd_builder.cc:846</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_af988e3a6d8b0d3ede66e3f3aea992d5e"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">shaka::AdaptationSet::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00755">mpd_builder.cc:755</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01088">mpd_builder.cc:1088</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00412">mpd_builder.cc:412</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00843">mpd_builder.cc:843</a></div></div>
 <div class="ttc" id="structshaka_1_1MpdOptions_html"><div class="ttname"><a href="../../d1/df3/structshaka_1_1MpdOptions.html">shaka::MpdOptions</a></div><div class="ttdoc">Defines Mpd Options. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d60/mpd__options_8h_source.html#l00015">mpd_options.h:15</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_afcfb8f59204f6ec2f5dcd9cbd81dddf9"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">shaka::AdaptationSet::OnNewSegmentForRepresentation</a></div><div class="ttdeci">void OnNewSegmentForRepresentation(uint32_t representation_id, uint64_t start_time, uint64_t duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00857">mpd_builder.cc:857</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a7a4f96f12b589cfc4b5c2f44532eec53"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">shaka::MpdBuilder::InjectClockForTesting</a></div><div class="ttdeci">void InjectClockForTesting(std::unique_ptr&lt; base::Clock &gt; clock)</div><div class="ttdoc">This is for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00105">mpd_builder.h:105</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01098">mpd_builder.cc:1098</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_afcfb8f59204f6ec2f5dcd9cbd81dddf9"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">shaka::AdaptationSet::OnNewSegmentForRepresentation</a></div><div class="ttdeci">void OnNewSegmentForRepresentation(uint32_t representation_id, uint64_t start_time, uint64_t duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00854">mpd_builder.cc:854</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a7a4f96f12b589cfc4b5c2f44532eec53"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">shaka::MpdBuilder::InjectClockForTesting</a></div><div class="ttdeci">void InjectClockForTesting(std::unique_ptr&lt; base::Clock &gt; clock)</div><div class="ttdoc">This is for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00104">mpd_builder.h:104</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01094">mpd_builder.cc:1094</a></div></div>
 <div class="ttc" id="classBandwidthEstimator_html"><div class="ttname"><a href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d19/bandwidth__estimator_8h_source.html#l00015">bandwidth_estimator.h:15</a></div></div>
 <div class="ttc" id="classshaka_1_1RepresentationStateChangeListener_html_a2fc3088977c82cab3bac96be10c7c117"><div class="ttname"><a href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html#a2fc3088977c82cab3bac96be10c7c117">shaka::RepresentationStateChangeListener::OnNewSegmentForRepresentation</a></div><div class="ttdeci">virtual void OnNewSegmentForRepresentation(uint64_t start_time, uint64_t duration)=0</div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a473e45dbbf64e6ab6ed670ccedac84ed"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation::SuppressOnce</a></div><div class="ttdeci">void SuppressOnce(SuppressFlag flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01207">mpd_builder.cc:1207</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a473e45dbbf64e6ab6ed670ccedac84ed"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation::SuppressOnce</a></div><div class="ttdeci">void SuppressOnce(SuppressFlag flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01203">mpd_builder.cc:1203</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/da4/classshaka_1_1media_1_1AVCDecoderConfigurationRecord-members.html b/docs/d6/da4/classshaka_1_1media_1_1AVCDecoderConfigurationRecord-members.html
index 29e33afca1..c55aacdef4 100644
--- a/docs/d6/da4/classshaka_1_1media_1_1AVCDecoderConfigurationRecord-members.html
+++ b/docs/d6/da4/classshaka_1_1media_1_1AVCDecoderConfigurationRecord-members.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/da6/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo-members.html b/docs/d6/da6/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo-members.html
index cd197ed089..60e5299e00 100644
--- a/docs/d6/da6/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo-members.html
+++ b/docs/d6/da6/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo-members.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/da9/classshaka_1_1media_1_1BitReader.html b/docs/d6/da9/classshaka_1_1media_1_1BitReader.html
index 9a0c8da69c..97189fb68d 100644
--- a/docs/d6/da9/classshaka_1_1media_1_1BitReader.html
+++ b/docs/d6/da9/classshaka_1_1media_1_1BitReader.html
@@ -365,7 +365,7 @@ template&lt;typename T &gt; </div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/daa/structshaka_1_1media_1_1mp4_1_1VTTCueBox.html b/docs/d6/daa/structshaka_1_1media_1_1mp4_1_1VTTCueBox.html
index 8ba0b7e49a..97c0c808d4 100644
--- a/docs/d6/daa/structshaka_1_1media_1_1mp4_1_1VTTCueBox.html
+++ b/docs/d6/daa/structshaka_1_1media_1_1mp4_1_1VTTCueBox.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/db1/classshaka_1_1media_1_1MediaStream-members.html b/docs/d6/db1/classshaka_1_1media_1_1MediaStream-members.html
index c1a522ba9f..3311077057 100644
--- a/docs/d6/db1/classshaka_1_1media_1_1MediaStream-members.html
+++ b/docs/d6/db1/classshaka_1_1media_1_1MediaStream-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html b/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html
index b5fa48586a..5a6a256d83 100644
--- a/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html
+++ b/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html
@@ -307,7 +307,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_language</b> (con
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00050">50</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00049">49</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
 
 </div>
 </div>
@@ -336,7 +336,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_language</b> (con
 
 <p>Implements <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html#a6e5c5ade77b7bcf0b7822de568695dc8">shaka::media::StreamInfo</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00068">68</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00067">67</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
 
 </div>
 </div>
@@ -418,7 +418,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_language</b> (con
 
 <p>Reimplemented from <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html#aa11d2fe5509ebfdc038aa3f2cdbbe00d">shaka::media::StreamInfo</a>.</p>
 
-<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00075">75</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html#l00074">74</a> of file <a class="el" href="../../dd/d19/video__stream__info_8cc_source.html">video_stream_info.cc</a>.</p>
 
 </div>
 </div>
@@ -429,7 +429,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_language</b> (con
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/db1/structshaka_1_1media_1_1VideoStreamInfoParameters-members.html b/docs/d6/db1/structshaka_1_1media_1_1VideoStreamInfoParameters-members.html
index cfb9eb0045..96584e19dd 100644
--- a/docs/d6/db1/structshaka_1_1media_1_1VideoStreamInfoParameters-members.html
+++ b/docs/d6/db1/structshaka_1_1media_1_1VideoStreamInfoParameters-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dc6/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo-members.html b/docs/d6/dc6/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo-members.html
index 530ac5230c..9165a09ff5 100644
--- a/docs/d6/dc6/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo-members.html
+++ b/docs/d6/dc6/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dc7/classshaka_1_1media_1_1mp2t_1_1EsParserH26x-members.html b/docs/d6/dc7/classshaka_1_1media_1_1mp2t_1_1EsParserH26x-members.html
index fb0148f8a2..b7fcd10f04 100644
--- a/docs/d6/dc7/classshaka_1_1media_1_1mp2t_1_1EsParserH26x-members.html
+++ b/docs/d6/dc7/classshaka_1_1media_1_1mp2t_1_1EsParserH26x-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dc8/mkv__writer_8cc_source.html b/docs/d6/dc8/mkv__writer_8cc_source.html
index b3d0e6a3d9..cc9e6ec089 100644
--- a/docs/d6/dc8/mkv__writer_8cc_source.html
+++ b/docs/d6/dc8/mkv__writer_8cc_source.html
@@ -195,7 +195,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html b/docs/d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html
index 7c56bbdefb..02bc586f40 100644
--- a/docs/d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html
+++ b/docs/d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html
@@ -250,7 +250,7 @@ std::vector&lt; <a class="el" href="../../d1/d34/structshaka_1_1media_1_1Subsamp
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dcc/classshaka_1_1media_1_1VP9Parser-members.html b/docs/d6/dcc/classshaka_1_1media_1_1VP9Parser-members.html
index efc5b45f2a..2fb567a716 100644
--- a/docs/d6/dcc/classshaka_1_1media_1_1VP9Parser-members.html
+++ b/docs/d6/dcc/classshaka_1_1media_1_1VP9Parser-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dce/structshaka_1_1media_1_1mp4_1_1SegmentReference-members.html b/docs/d6/dce/structshaka_1_1media_1_1mp4_1_1SegmentReference-members.html
index 49557682fb..c26d135be2 100644
--- a/docs/d6/dce/structshaka_1_1media_1_1mp4_1_1SegmentReference-members.html
+++ b/docs/d6/dce/structshaka_1_1media_1_1mp4_1_1SegmentReference-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dcf/classshaka_1_1media_1_1mp2t_1_1EsParserAdts.html b/docs/d6/dcf/classshaka_1_1media_1_1mp2t_1_1EsParserAdts.html
index 09cba13bb1..b0a685f42f 100644
--- a/docs/d6/dcf/classshaka_1_1media_1_1mp2t_1_1EsParserAdts.html
+++ b/docs/d6/dcf/classshaka_1_1media_1_1mp2t_1_1EsParserAdts.html
@@ -148,7 +148,7 @@ const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html b/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html
index 4ffef991b2..8d96088c00 100644
--- a/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html
+++ b/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html
@@ -119,7 +119,7 @@ union {</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00226">226</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00227">227</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following files:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 <li>media/codecs/<a class="el" href="../../dc/d7b/h264__parser_8cc_source.html">h264_parser.cc</a></li>
@@ -127,7 +127,7 @@ union {</td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dde/structshaka_1_1media_1_1H265VuiParameters-members.html b/docs/d6/dde/structshaka_1_1media_1_1H265VuiParameters-members.html
index 8bb6b32eba..56928fe67b 100644
--- a/docs/d6/dde/structshaka_1_1media_1_1H265VuiParameters-members.html
+++ b/docs/d6/dde/structshaka_1_1media_1_1H265VuiParameters-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/de4/structshaka_1_1media_1_1mp4_1_1CueTimeBox-members.html b/docs/d6/de4/structshaka_1_1media_1_1mp4_1_1CueTimeBox-members.html
index 1c5560bb35..87f1ffcf54 100644
--- a/docs/d6/de4/structshaka_1_1media_1_1mp4_1_1CueTimeBox-members.html
+++ b/docs/d6/de4/structshaka_1_1media_1_1mp4_1_1CueTimeBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/de7/structshaka_1_1media_1_1VPxFrameInfo-members.html b/docs/d6/de7/structshaka_1_1media_1_1VPxFrameInfo-members.html
index 2db7abab84..c89c5e2038 100644
--- a/docs/d6/de7/structshaka_1_1media_1_1VPxFrameInfo-members.html
+++ b/docs/d6/de7/structshaka_1_1media_1_1VPxFrameInfo-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/de8/local__file_8cc_source.html b/docs/d6/de8/local__file_8cc_source.html
index 8a2234827b..4b0bd4f096 100644
--- a/docs/d6/de8/local__file_8cc_source.html
+++ b/docs/d6/de8/local__file_8cc_source.html
@@ -211,7 +211,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/de8/network__util_8h_source.html b/docs/d6/de8/network__util_8h_source.html
index ca5d06c1db..e61b49a390 100644
--- a/docs/d6/de8/network__util_8h_source.html
+++ b/docs/d6/de8/network__util_8h_source.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/de9/ts__segmenter_8cc_source.html b/docs/d6/de9/ts__segmenter_8cc_source.html
index ba2261d2a2..affe73e434 100644
--- a/docs/d6/de9/ts__segmenter_8cc_source.html
+++ b/docs/d6/de9/ts__segmenter_8cc_source.html
@@ -288,7 +288,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_a4cb75da6ff50d6403da18ea8dcc04265"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a4cb75da6ff50d6403da18ea8dcc04265">shaka::media::MuxerListener::OnNewSegment</a></div><div class="ttdeci">virtual void OnNewSegment(const std::string &amp;segment_name, uint64_t start_time, uint64_t duration, uint64_t segment_file_size)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_ab521acca727bbe01aa15c751325c0001"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#ab521acca727bbe01aa15c751325c0001">shaka::media::MuxerListener::OnEncryptionInfoReady</a></div><div class="ttdeci">virtual void OnEncryptionInfoReady(bool is_initial_encryption_info, FourCC protection_scheme, const std::vector&lt; uint8_t &gt; &amp;key_id, const std::vector&lt; uint8_t &gt; &amp;iv, const std::vector&lt; ProtectionSystemSpecificInfo &gt; &amp;key_system_info)=0</div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d88/pes__packet__generator_8h_source.html#l00032">pes_packet_generator.h:32</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d88/pes__packet__generator_8h_source.html#l00031">pes_packet_generator.h:31</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">shaka::media::StreamInfo</a></div><div class="ttdoc">Abstract class holds stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/daa/stream__info_8h_source.html#l00053">stream_info.h:53</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_a5fc925f3324b5cfab955b1fac1f52094"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a5fc925f3324b5cfab955b1fac1f52094">shaka::media::mp2t::TsSegmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00088">ts_segmenter.cc:88</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_ac92da7c996e2a270fd704facc8f7a149"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ac92da7c996e2a270fd704facc8f7a149">shaka::media::mp2t::TsSegmenter::Finalize</a></div><div class="ttdeci">Status Finalize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00081">ts_segmenter.cc:81</a></div></div>
@@ -297,7 +297,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_a994eb66cf09d8b08fd1c964f6afd3ab3"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">shaka::media::KeySource::GetKey</a></div><div class="ttdeci">virtual Status GetKey(TrackType track_type, EncryptionKey *key)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_af0e91f691388ecffb8a473554707c917"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#af0e91f691388ecffb8a473554707c917">shaka::media::mp2t::TsSegmenter::TsSegmenter</a></div><div class="ttdeci">TsSegmenter(const MuxerOptions &amp;options, MuxerListener *listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00027">ts_segmenter.cc:27</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_abb78b18426643d58bc44ea61823dc29c"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">shaka::media::mp2t::TsSegmenter::InjectPesPacketGeneratorForTesting</a></div><div class="ttdeci">void InjectPesPacketGeneratorForTesting(std::unique_ptr&lt; PesPacketGenerator &gt; generator)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00116">ts_segmenter.cc:116</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_a34ab9fbaee43115d68be87e4b9e90918"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">shaka::media::mp2t::TsSegmenter::SetTsWriterFileOpenedForTesting</a></div><div class="ttdeci">void SetTsWriterFileOpenedForTesting(bool value)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00121">ts_segmenter.cc:121</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_ae3ed0f86d2163444e24a2577e35517a9"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">shaka::media::mp2t::TsSegmenter::InjectTsWriterForTesting</a></div><div class="ttdeci">void InjectTsWriterForTesting(std::unique_ptr&lt; TsWriter &gt; writer)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00112">ts_segmenter.cc:112</a></div></div>
@@ -313,7 +313,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/ded/ts__packet_8h_source.html b/docs/d6/ded/ts__packet_8h_source.html
index 3ee4a195ed..887c620ada 100644
--- a/docs/d6/ded/ts__packet_8h_source.html
+++ b/docs/d6/ded/ts__packet_8h_source.html
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/def/sync__sample__iterator_8cc_source.html b/docs/d6/def/sync__sample__iterator_8cc_source.html
index e4a4b73013..e06dc6abf1 100644
--- a/docs/d6/def/sync__sample__iterator_8cc_source.html
+++ b/docs/d6/def/sync__sample__iterator_8cc_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d6/dff/classshaka_1_1media_1_1Nalu.html b/docs/d6/dff/classshaka_1_1media_1_1Nalu.html
index a4fc212071..e35a91bb83 100644
--- a/docs/d6/dff/classshaka_1_1media_1_1Nalu.html
+++ b/docs/d6/dff/classshaka_1_1media_1_1Nalu.html
@@ -243,7 +243,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>can_start_access_unit
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d01/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription.html b/docs/d7/d01/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription.html
index fa6134abdc..ba02b3368c 100644
--- a/docs/d7/d01/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription.html
+++ b/docs/d7/d01/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription.html
@@ -194,7 +194,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d07/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader.html b/docs/d7/d07/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader.html
index 9b84787979..93d6055642 100644
--- a/docs/d7/d07/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader.html
+++ b/docs/d7/d07/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d0b/muxer__listener__test__helper_8h_source.html b/docs/d7/d0b/muxer__listener__test__helper_8h_source.html
index 093ce73641..9ea83dcb9f 100644
--- a/docs/d7/d0b/muxer__listener__test__helper_8h_source.html
+++ b/docs/d7/d0b/muxer__listener__test__helper_8h_source.html
@@ -206,7 +206,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d12/media__parser_8h_source.html b/docs/d7/d12/media__parser_8h_source.html
index 44288e7b15..1a83c141d2 100644
--- a/docs/d7/d12/media__parser_8h_source.html
+++ b/docs/d7/d12/media__parser_8h_source.html
@@ -149,7 +149,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d15/mpd__notifier_8h_source.html b/docs/d7/d15/mpd__notifier_8h_source.html
index f83887b27f..e5349de695 100644
--- a/docs/d7/d15/mpd__notifier_8h_source.html
+++ b/docs/d7/d15/mpd__notifier_8h_source.html
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d16/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry-members.html b/docs/d7/d16/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry-members.html
index c6075f7c83..8a54124068 100644
--- a/docs/d7/d16/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry-members.html
+++ b/docs/d7/d16/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d22/libcrypto__threading_8h_source.html b/docs/d7/d22/libcrypto__threading_8h_source.html
index 5a7f73cb06..b7650a25ee 100644
--- a/docs/d7/d22/libcrypto__threading_8h_source.html
+++ b/docs/d7/d22/libcrypto__threading_8h_source.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d26/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator.html b/docs/d7/d26/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator.html
index 5a3de76dd9..b3f6e1e598 100644
--- a/docs/d7/d26/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator.html
+++ b/docs/d7/d26/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator.html
@@ -177,7 +177,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d29/structshaka_1_1media_1_1H265Sps-members.html b/docs/d7/d29/structshaka_1_1media_1_1H265Sps-members.html
index 7bc723deda..3e07a88784 100644
--- a/docs/d7/d29/structshaka_1_1media_1_1H265Sps-members.html
+++ b/docs/d7/d29/structshaka_1_1media_1_1H265Sps-members.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d29/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample-members.html b/docs/d7/d29/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample-members.html
index 8328099e74..1fca280cb2 100644
--- a/docs/d7/d29/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample-members.html
+++ b/docs/d7/d29/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d36/classshaka_1_1media_1_1ContentEncoding-members.html b/docs/d7/d36/classshaka_1_1media_1_1ContentEncoding-members.html
index 4d736f1193..5432ae81dd 100644
--- a/docs/d7/d36/classshaka_1_1media_1_1ContentEncoding-members.html
+++ b/docs/d7/d36/classshaka_1_1media_1_1ContentEncoding-members.html
@@ -132,7 +132,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d42/protection__system__specific__info_8cc_source.html b/docs/d7/d42/protection__system__specific__info_8cc_source.html
index de4a8e248c..f505b986ff 100644
--- a/docs/d7/d42/protection__system__specific__info_8cc_source.html
+++ b/docs/d7/d42/protection__system__specific__info_8cc_source.html
@@ -219,7 +219,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d42/structshaka_1_1media_1_1mp4_1_1SampleSize.html b/docs/d7/d42/structshaka_1_1media_1_1mp4_1_1SampleSize.html
index 5eabf90f85..7e7b76131d 100644
--- a/docs/d7/d42/structshaka_1_1media_1_1mp4_1_1SampleSize.html
+++ b/docs/d7/d42/structshaka_1_1media_1_1mp4_1_1SampleSize.html
@@ -188,7 +188,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d44/structshaka_1_1media_1_1mp4_1_1SampleEncryption-members.html b/docs/d7/d44/structshaka_1_1media_1_1mp4_1_1SampleEncryption-members.html
index c27dfd80b1..9c886dee57 100644
--- a/docs/d7/d44/structshaka_1_1media_1_1mp4_1_1SampleEncryption-members.html
+++ b/docs/d7/d44/structshaka_1_1media_1_1mp4_1_1SampleEncryption-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d46/classshaka_1_1media_1_1WebMListParser-members.html b/docs/d7/d46/classshaka_1_1media_1_1WebMListParser-members.html
index 12cbf3249e..8c168ab9c1 100644
--- a/docs/d7/d46/classshaka_1_1media_1_1WebMListParser-members.html
+++ b/docs/d7/d46/classshaka_1_1media_1_1WebMListParser-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d54/classshaka_1_1media_1_1H26xByteToUnitStreamConverter-members.html b/docs/d7/d54/classshaka_1_1media_1_1H26xByteToUnitStreamConverter-members.html
index e3a3d077b7..73f5902825 100644
--- a/docs/d7/d54/classshaka_1_1media_1_1H26xByteToUnitStreamConverter-members.html
+++ b/docs/d7/d54/classshaka_1_1media_1_1H26xByteToUnitStreamConverter-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html b/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html
index df46563876..4bbc1364ba 100644
--- a/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html
+++ b/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html
@@ -111,7 +111,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>DecryptSampleBuffer</
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html" title="DecryptorSource wraps KeySource and is responsible for decryptor management. ">DecryptorSource</a> wraps <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html" title="KeySource is responsible for encryption key acquisition. ">KeySource</a> and is responsible for decryptor management. </p>
 
-<p>Definition at line <a class="el" href="../../d0/d7d/decryptor__source_8h_source.html#l00021">21</a> of file <a class="el" href="../../d0/d7d/decryptor__source_8h_source.html">decryptor_source.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d0/d7d/decryptor__source_8h_source.html#l00022">22</a> of file <a class="el" href="../../d0/d7d/decryptor__source_8h_source.html">decryptor_source.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/base/<a class="el" href="../../d0/d7d/decryptor__source_8h_source.html">decryptor_source.h</a></li>
 <li>media/base/<a class="el" href="../../d1/d2a/decryptor__source_8cc_source.html">decryptor_source.cc</a></li>
@@ -119,7 +119,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>DecryptSampleBuffer</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html b/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html
index 2ce0c4e5fe..6826c44ffd 100644
--- a/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html
+++ b/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html
@@ -411,7 +411,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>base::RefCountedThre
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d75/structshaka_1_1media_1_1mp4_1_1MediaHeader-members.html b/docs/d7/d75/structshaka_1_1media_1_1mp4_1_1MediaHeader-members.html
index 536b11619c..7610afa55c 100644
--- a/docs/d7/d75/structshaka_1_1media_1_1mp4_1_1MediaHeader-members.html
+++ b/docs/d7/d75/structshaka_1_1media_1_1mp4_1_1MediaHeader-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d78/structshaka_1_1media_1_1H264SEIMessage-members.html b/docs/d7/d78/structshaka_1_1media_1_1H264SEIMessage-members.html
index 69c4d8826e..affc68f318 100644
--- a/docs/d7/d78/structshaka_1_1media_1_1H264SEIMessage-members.html
+++ b/docs/d7/d78/structshaka_1_1media_1_1H264SEIMessage-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d7a/classshaka_1_1media_1_1UdpFile.html b/docs/d7/d7a/classshaka_1_1media_1_1UdpFile.html
index 426e3fa94a..94d724cd93 100644
--- a/docs/d7/d7a/classshaka_1_1media_1_1UdpFile.html
+++ b/docs/d7/d7a/classshaka_1_1media_1_1UdpFile.html
@@ -463,7 +463,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d7c/vlog__flags_8h_source.html b/docs/d7/d7c/vlog__flags_8h_source.html
index 7d55582bfa..a849d399bd 100644
--- a/docs/d7/d7c/vlog__flags_8h_source.html
+++ b/docs/d7/d7c/vlog__flags_8h_source.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d87/video__stream__info_8h_source.html b/docs/d7/d87/video__stream__info_8h_source.html
index 04f1a1bfa0..af65371936 100644
--- a/docs/d7/d87/video__stream__info_8h_source.html
+++ b/docs/d7/d87/video__stream__info_8h_source.html
@@ -153,16 +153,16 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
 <div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_VIDEO_STREAM_INFO_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">shaka::media::StreamInfo</a></div><div class="ttdoc">Abstract class holds stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/daa/stream__info_8h_source.html#l00053">stream_info.h:53</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a8978ca2bc2dd63c2e25e77cdcf676162"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">shaka::media::VideoStreamInfo::IsValidConfig</a></div><div class="ttdeci">bool IsValidConfig() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00068">video_stream_info.cc:68</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a8978ca2bc2dd63c2e25e77cdcf676162"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">shaka::media::VideoStreamInfo::IsValidConfig</a></div><div class="ttdeci">bool IsValidConfig() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00067">video_stream_info.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_ae420a97a606ef54be16beb49e42cd135"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#ae420a97a606ef54be16beb49e42cd135">shaka::media::VideoStreamInfo::pixel_height</a></div><div class="ttdeci">uint32_t pixel_height() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00042">video_stream_info.h:42</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_af5f655f36865a3af28bd0c7328e9a91e"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#af5f655f36865a3af28bd0c7328e9a91e">shaka::media::VideoStreamInfo::pixel_width</a></div><div class="ttdeci">uint32_t pixel_width() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00039">video_stream_info.h:39</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">shaka::media::VideoStreamInfo</a></div><div class="ttdoc">Holds video stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00016">video_stream_info.h:16</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a9cac8e75d76f1192a48d1dcf61435537"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">shaka::media::VideoStreamInfo::ToString</a></div><div class="ttdeci">std::string ToString() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00075">video_stream_info.cc:75</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a3de6a7d65ddd877c513f3047a86db59e"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">shaka::media::VideoStreamInfo::VideoStreamInfo</a></div><div class="ttdeci">VideoStreamInfo(int track_id, uint32_t time_scale, uint64_t duration, Codec codec, const std::string &amp;codec_string, const uint8_t *codec_config, size_t codec_config_size, uint16_t width, uint16_t height, uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate, uint8_t nalu_length_size, const std::string &amp;language, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00050">video_stream_info.cc:50</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a9cac8e75d76f1192a48d1dcf61435537"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">shaka::media::VideoStreamInfo::ToString</a></div><div class="ttdeci">std::string ToString() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00074">video_stream_info.cc:74</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a3de6a7d65ddd877c513f3047a86db59e"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">shaka::media::VideoStreamInfo::VideoStreamInfo</a></div><div class="ttdeci">VideoStreamInfo(int track_id, uint32_t time_scale, uint64_t duration, Codec codec, const std::string &amp;codec_string, const uint8_t *codec_config, size_t codec_config_size, uint16_t width, uint16_t height, uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate, uint8_t nalu_length_size, const std::string &amp;language, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00049">video_stream_info.cc:49</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d9c/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo.html b/docs/d7/d9c/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo.html
index 9da8c9ea0d..57396a4f64 100644
--- a/docs/d7/d9c/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo.html
+++ b/docs/d7/d9c/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo.html
@@ -112,7 +112,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>delta_poc_msb_cycle_lt
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/d9d/progress__listener_8h_source.html b/docs/d7/d9d/progress__listener_8h_source.html
index 50e28eb0a3..06282ad6a5 100644
--- a/docs/d7/d9d/progress__listener_8h_source.html
+++ b/docs/d7/d9d/progress__listener_8h_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/da4/track__run__iterator_8h_source.html b/docs/d7/da4/track__run__iterator_8h_source.html
index 2d3a891481..4ffcf9feaf 100644
--- a/docs/d7/da4/track__run__iterator_8h_source.html
+++ b/docs/d7/da4/track__run__iterator_8h_source.html
@@ -195,7 +195,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dae/structshaka_1_1media_1_1mp4_1_1MediaData.html b/docs/d7/dae/structshaka_1_1media_1_1mp4_1_1MediaData.html
index 4d3527c8cc..b26147ff0c 100644
--- a/docs/d7/dae/structshaka_1_1media_1_1mp4_1_1MediaData.html
+++ b/docs/d7/dae/structshaka_1_1media_1_1mp4_1_1MediaData.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/db0/mpd__writer_8h_source.html b/docs/d7/db0/mpd__writer_8h_source.html
index a2261b831e..db0fa29a06 100644
--- a/docs/d7/db0/mpd__writer_8h_source.html
+++ b/docs/d7/db0/mpd__writer_8h_source.html
@@ -183,7 +183,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/db7/structshaka_1_1media_1_1mp4_1_1SampleToChunk-members.html b/docs/d7/db7/structshaka_1_1media_1_1mp4_1_1SampleToChunk-members.html
index 2073f49c93..f1db51832e 100644
--- a/docs/d7/db7/structshaka_1_1media_1_1mp4_1_1SampleToChunk-members.html
+++ b/docs/d7/db7/structshaka_1_1media_1_1mp4_1_1SampleToChunk-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dc3/structshaka_1_1media_1_1mp4_1_1TextSampleEntry.html b/docs/d7/dc3/structshaka_1_1media_1_1mp4_1_1TextSampleEntry.html
index 166cbe7938..e09f50a9b2 100644
--- a/docs/d7/dc3/structshaka_1_1media_1_1mp4_1_1TextSampleEntry.html
+++ b/docs/d7/dc3/structshaka_1_1media_1_1mp4_1_1TextSampleEntry.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dc6/byte__queue_8h_source.html b/docs/d7/dc6/byte__queue_8h_source.html
index 580dd4b380..14663fb4e8 100644
--- a/docs/d7/dc6/byte__queue_8h_source.html
+++ b/docs/d7/dc6/byte__queue_8h_source.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dd0/mpd__notifier__util_8h_source.html b/docs/d7/dd0/mpd__notifier__util_8h_source.html
index 18c5a8eb5a..169c82ae6e 100644
--- a/docs/d7/dd0/mpd__notifier__util_8h_source.html
+++ b/docs/d7/dd0/mpd__notifier__util_8h_source.html
@@ -128,7 +128,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dd4/request__signer_8h_source.html b/docs/d7/dd4/request__signer_8h_source.html
index 9cf2aa16f8..5597607a0f 100644
--- a/docs/d7/dd4/request__signer_8h_source.html
+++ b/docs/d7/dd4/request__signer_8h_source.html
@@ -179,7 +179,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html b/docs/d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html
index d1978410dc..22b14c4164 100644
--- a/docs/d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html
+++ b/docs/d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html
@@ -285,7 +285,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dd6/key__source_8cc_source.html b/docs/d7/dd6/key__source_8cc_source.html
index 6105750cbd..1f5154bdf4 100644
--- a/docs/d7/dd6/key__source_8cc_source.html
+++ b/docs/d7/dd6/key__source_8cc_source.html
@@ -142,7 +142,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html b/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html
index 53cd115bb8..de4159203e 100644
--- a/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html
+++ b/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html
@@ -177,7 +177,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html b/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html
index 7d4cda2e56..4e8693986f 100644
--- a/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html
+++ b/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html b/docs/d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html
index 0d26a1eaf7..651945ebad 100644
--- a/docs/d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html
+++ b/docs/d7/de0/classshaka_1_1media_1_1HttpKeyFetcher.html
@@ -311,7 +311,7 @@ KeyFetcher implementation overrides.</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/de0/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry.html b/docs/d7/de0/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry.html
index 9c7f98043c..7285e9eb31 100644
--- a/docs/d7/de0/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry.html
+++ b/docs/d7/de0/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry.html
@@ -120,7 +120,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>group_description
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dec/h264__byte__to__unit__stream__converter_8h_source.html b/docs/d7/dec/h264__byte__to__unit__stream__converter_8h_source.html
index da1d0b8c6e..9177cc4d8f 100644
--- a/docs/d7/dec/h264__byte__to__unit__stream__converter_8h_source.html
+++ b/docs/d7/dec/h264__byte__to__unit__stream__converter_8h_source.html
@@ -134,7 +134,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/dee/mpd__generator_8cc_source.html b/docs/d7/dee/mpd__generator_8cc_source.html
index 23b8789dca..646ba23054 100644
--- a/docs/d7/dee/mpd__generator_8cc_source.html
+++ b/docs/d7/dee/mpd__generator_8cc_source.html
@@ -232,7 +232,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/def/mp4__media__parser_8cc_source.html b/docs/d7/def/mp4__media__parser_8cc_source.html
index 75bbab2056..b5b54e70c9 100644
--- a/docs/d7/def/mp4__media__parser_8cc_source.html
+++ b/docs/d7/def/mp4__media__parser_8cc_source.html
@@ -850,13 +850,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaSample_html_a3fac8e4cc8da3b34ef5f698411ec868b"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">shaka::media::MediaSample::CopyFrom</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CopyFrom(const uint8_t *data, size_t size, bool is_key_frame)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00045">media_sample.cc:45</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html_acc87b9752a7f6e8c739109acbc02b69d"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#acc87b9752a7f6e8c739109acbc02b69d">shaka::media::mp4::MP4MediaParser::Init</a></div><div class="ttdeci">void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/def/mp4__media__parser_8cc_source.html#l00095">mp4_media_parser.cc:95</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00021">decryptor_source.h:21</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1DecryptorSource_html"><div class="ttname"><a href="../../d7/d59/classshaka_1_1media_1_1DecryptorSource.html">shaka::media::DecryptorSource</a></div><div class="ttdoc">DecryptorSource wraps KeySource and is responsible for decryptor management. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d7d/decryptor__source_8h_source.html#l00022">decryptor_source.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1BoxReader_html_a6bafd9cd95a97c4c1475d1806d602ae2"><div class="ttname"><a href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#a6bafd9cd95a97c4c1475d1806d602ae2">shaka::media::mp4::BoxReader::StartBox</a></div><div class="ttdeci">static bool StartBox(const uint8_t *buf, const size_t buf_size, FourCC *type, uint64_t *box_size, bool *err) WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/df1/box__reader_8cc_source.html#l00055">box_reader.cc:55</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1BoxReader_html_ae348922875d67128d2af6d88b692e205"><div class="ttname"><a href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#ae348922875d67128d2af6d88b692e205">shaka::media::mp4::BoxReader::ReadBox</a></div><div class="ttdeci">static BoxReader * ReadBox(const uint8_t *buf, const size_t buf_size, bool *err)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/df1/box__reader_8cc_source.html#l00037">box_reader.cc:37</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d7/df9/byte__queue_8cc_source.html b/docs/d7/df9/byte__queue_8cc_source.html
index 32b52ed400..962e024001 100644
--- a/docs/d7/df9/byte__queue_8cc_source.html
+++ b/docs/d7/df9/byte__queue_8cc_source.html
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html b/docs/d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html
index 9912573a41..3ae5237c0a 100644
--- a/docs/d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html
+++ b/docs/d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html
@@ -171,7 +171,7 @@ static const size_t&#160;</td><td class="memItemRight" valign="bottom"><b>kUnitS
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d08/classshaka_1_1media_1_1WebMClusterParser-members.html b/docs/d8/d08/classshaka_1_1media_1_1WebMClusterParser-members.html
index c26efb8401..d506a1ba0d 100644
--- a/docs/d8/d08/classshaka_1_1media_1_1WebMClusterParser-members.html
+++ b/docs/d8/d08/classshaka_1_1media_1_1WebMClusterParser-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d08/classshaka_1_1media_1_1mp2t_1_1TsWriter-members.html b/docs/d8/d08/classshaka_1_1media_1_1mp2t_1_1TsWriter-members.html
index b31065d9ff..8386021cef 100644
--- a/docs/d8/d08/classshaka_1_1media_1_1mp2t_1_1TsWriter-members.html
+++ b/docs/d8/d08/classshaka_1_1media_1_1mp2t_1_1TsWriter-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d08/structshaka_1_1media_1_1mp4_1_1MovieHeader-members.html b/docs/d8/d08/structshaka_1_1media_1_1mp4_1_1MovieHeader-members.html
index 1c660b07e3..38e8f02fa5 100644
--- a/docs/d8/d08/structshaka_1_1media_1_1mp4_1_1MovieHeader-members.html
+++ b/docs/d8/d08/structshaka_1_1media_1_1mp4_1_1MovieHeader-members.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d0d/media__sample_8cc_source.html b/docs/d8/d0d/media__sample_8cc_source.html
index 605dc85c57..63121c4f66 100644
--- a/docs/d8/d0d/media__sample_8cc_source.html
+++ b/docs/d8/d0d/media__sample_8cc_source.html
@@ -195,7 +195,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1DecodingTime.html b/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1DecodingTime.html
index 7f2b900ec5..33892c41b2 100644
--- a/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1DecodingTime.html
+++ b/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1DecodingTime.html
@@ -112,7 +112,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>sample_delta</b><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1PrivFrame-members.html b/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1PrivFrame-members.html
index 33feb75318..1ce3a42068 100644
--- a/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1PrivFrame-members.html
+++ b/docs/d8/d12/structshaka_1_1media_1_1mp4_1_1PrivFrame-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d13/classshaka_1_1media_1_1BitReader-members.html b/docs/d8/d13/classshaka_1_1media_1_1BitReader-members.html
index 9c511a7d43..f19a1d8e3e 100644
--- a/docs/d8/d13/classshaka_1_1media_1_1BitReader-members.html
+++ b/docs/d8/d13/classshaka_1_1media_1_1BitReader-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d14/classshaka_1_1media_1_1VP8Parser.html b/docs/d8/d14/classshaka_1_1media_1_1VP8Parser.html
index ab7b616ba5..2de56bcce9 100644
--- a/docs/d8/d14/classshaka_1_1media_1_1VP8Parser.html
+++ b/docs/d8/d14/classshaka_1_1media_1_1VP8Parser.html
@@ -235,7 +235,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d16/structshaka_1_1media_1_1MuxerOptions-members.html b/docs/d8/d16/structshaka_1_1media_1_1MuxerOptions-members.html
index 2e284e064d..31766bd725 100644
--- a/docs/d8/d16/structshaka_1_1media_1_1MuxerOptions-members.html
+++ b/docs/d8/d16/structshaka_1_1media_1_1MuxerOptions-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d19/bandwidth__estimator_8h_source.html b/docs/d8/d19/bandwidth__estimator_8h_source.html
index 38de7e8079..f440cbd086 100644
--- a/docs/d8/d19/bandwidth__estimator_8h_source.html
+++ b/docs/d8/d19/bandwidth__estimator_8h_source.html
@@ -133,7 +133,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d20/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox.html b/docs/d8/d20/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox.html
index e301069556..d7e7f0ac41 100644
--- a/docs/d8/d20/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox.html
+++ b/docs/d8/d20/structshaka_1_1media_1_1mp4_1_1WebVTTConfigurationBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d23/structshaka_1_1media_1_1SubsampleEntry-members.html b/docs/d8/d23/structshaka_1_1media_1_1SubsampleEntry-members.html
index 5c0dee2632..e729dfc668 100644
--- a/docs/d8/d23/structshaka_1_1media_1_1SubsampleEntry-members.html
+++ b/docs/d8/d23/structshaka_1_1media_1_1SubsampleEntry-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d28/es__parser__h265_8h_source.html b/docs/d8/d28/es__parser__h265_8h_source.html
index 093fbb0da9..811785b497 100644
--- a/docs/d8/d28/es__parser__h265_8h_source.html
+++ b/docs/d8/d28/es__parser__h265_8h_source.html
@@ -153,7 +153,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d33/webm__content__encodings__client_8h_source.html b/docs/d8/d33/webm__content__encodings__client_8h_source.html
index 17d2e424a5..92c9150845 100644
--- a/docs/d8/d33/webm__content__encodings__client_8h_source.html
+++ b/docs/d8/d33/webm__content__encodings__client_8h_source.html
@@ -98,49 +98,48 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_content_encodings.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_parser.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">typedef</span> std::vector&lt;ContentEncoding*&gt; ContentEncodings;</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
-<div class="line"><a name="l00022"></a><span class="lineno"><a class="line" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a> : <span class="keyword">public</span> <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a> {</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>();</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  ~<a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keyword">const</span> ContentEncodings&amp; content_encodings() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">OnListStart</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordtype">bool</span> OnListEnd(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">bool</span> OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">bool</span> OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  std::unique_ptr&lt;ContentEncoding&gt; cur_content_encoding_;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">bool</span> content_encryption_encountered_;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  ContentEncodings content_encodings_;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="comment">// |content_encodings_| is ready. For debugging purpose.</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> content_encodings_ready_;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>);</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;};</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">shaka::media::WebMContentEncodingsClient</a></div><div class="ttdoc">Parser for WebM ContentEncodings element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d33/webm__content__encodings__client_8h_source.html#l00022">webm_content_encodings_client.h:22</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html_a7b8b5447b3d573657f6dc029d2e6d8b7"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">shaka::media::WebMContentEncodingsClient::OnListStart</a></div><div class="ttdeci">WebMParserClient * OnListStart(int id) override</div><div class="ttdoc">WebMParserClient methods. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d77/webm__content__encodings__client_8cc_source.html#l00026">webm_content_encodings_client.cc:26</a></div></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_content_encodings.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_parser.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">typedef</span> std::vector&lt;std::unique_ptr&lt;ContentEncoding&gt;&gt; ContentEncodings;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
+<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a> : <span class="keyword">public</span> <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a> {</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>();</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  ~<a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keyword">const</span> ContentEncodings&amp; content_encodings() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">OnListStart</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keywordtype">bool</span> OnListEnd(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordtype">bool</span> OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">bool</span> OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  std::unique_ptr&lt;ContentEncoding&gt; cur_content_encoding_;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordtype">bool</span> content_encryption_encountered_;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  ContentEncodings content_encodings_;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="comment">// |content_encodings_| is ready. For debugging purpose.</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> content_encodings_ready_;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a>);</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;};</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">shaka::media::WebMContentEncodingsClient</a></div><div class="ttdoc">Parser for WebM ContentEncodings element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d33/webm__content__encodings__client_8h_source.html#l00021">webm_content_encodings_client.h:21</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html_a7b8b5447b3d573657f6dc029d2e6d8b7"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">shaka::media::WebMContentEncodingsClient::OnListStart</a></div><div class="ttdeci">WebMParserClient * OnListStart(int id) override</div><div class="ttdoc">WebMParserClient methods. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d77/webm__content__encodings__client_8cc_source.html#l00023">webm_content_encodings_client.cc:23</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMParserClient_html"><div class="ttname"><a href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">shaka::media::WebMParserClient</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d46/webm__parser_8h_source.html#l00030">webm_parser.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d3e/classshaka_1_1media_1_1StreamDescriptorCompareFn.html b/docs/d8/d3e/classshaka_1_1media_1_1StreamDescriptorCompareFn.html
index b4f8c5fd66..7d68515d0f 100644
--- a/docs/d8/d3e/classshaka_1_1media_1_1StreamDescriptorCompareFn.html
+++ b/docs/d8/d3e/classshaka_1_1media_1_1StreamDescriptorCompareFn.html
@@ -109,7 +109,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>operator()</b> (const
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d4d/aes__decryptor_8h_source.html b/docs/d8/d4d/aes__decryptor_8h_source.html
index 92a2fa439a..17608c3f32 100644
--- a/docs/d8/d4d/aes__decryptor_8h_source.html
+++ b/docs/d8/d4d/aes__decryptor_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry.html b/docs/d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry.html
index 3336461d39..97ff481b93 100644
--- a/docs/d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry.html
+++ b/docs/d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry.html
@@ -206,7 +206,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d5c/classshaka_1_1media_1_1MediaStream.html b/docs/d8/d5c/classshaka_1_1media_1_1MediaStream.html
index 08ae63ef7c..b20058ea35 100644
--- a/docs/d8/d5c/classshaka_1_1media_1_1MediaStream.html
+++ b/docs/d8/d5c/classshaka_1_1media_1_1MediaStream.html
@@ -225,7 +225,7 @@ const scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d6a/classshaka_1_1media_1_1ClusterBuilder-members.html b/docs/d8/d6a/classshaka_1_1media_1_1ClusterBuilder-members.html
index 86298bfb20..fb34ff6f64 100644
--- a/docs/d8/d6a/classshaka_1_1media_1_1ClusterBuilder-members.html
+++ b/docs/d8/d6a/classshaka_1_1media_1_1ClusterBuilder-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d6d/structshaka_1_1media_1_1mp4_1_1DataInformation.html b/docs/d8/d6d/structshaka_1_1media_1_1mp4_1_1DataInformation.html
index b73ba676fa..61ea90cf0e 100644
--- a/docs/d8/d6d/structshaka_1_1media_1_1mp4_1_1DataInformation.html
+++ b/docs/d8/d6d/structshaka_1_1media_1_1mp4_1_1DataInformation.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d70/structshaka_1_1media_1_1mp4_1_1Metadata-members.html b/docs/d8/d70/structshaka_1_1media_1_1mp4_1_1Metadata-members.html
index 014055eb9c..92df806811 100644
--- a/docs/d8/d70/structshaka_1_1media_1_1mp4_1_1Metadata-members.html
+++ b/docs/d8/d70/structshaka_1_1media_1_1mp4_1_1Metadata-members.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d74/classshaka_1_1media_1_1TracksBuilder.html b/docs/d8/d74/classshaka_1_1media_1_1TracksBuilder.html
index 86e0660438..695c36be01 100644
--- a/docs/d8/d74/classshaka_1_1media_1_1TracksBuilder.html
+++ b/docs/d8/d74/classshaka_1_1media_1_1TracksBuilder.html
@@ -123,7 +123,7 @@ std::vector&lt; uint8_t &gt;&#160;</td><td class="memItemRight" valign="bottom">
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html b/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html
index a8ec87fe2b..d66d727795 100644
--- a/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html
+++ b/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html
@@ -225,7 +225,7 @@ The number of bytes parsed on success. </dd></dl>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d88/structshaka_1_1media_1_1mp4_1_1MovieExtends-members.html b/docs/d8/d88/structshaka_1_1media_1_1mp4_1_1MovieExtends-members.html
index 451eaae201..9f0f0717a7 100644
--- a/docs/d8/d88/structshaka_1_1media_1_1mp4_1_1MovieExtends-members.html
+++ b/docs/d8/d88/structshaka_1_1media_1_1mp4_1_1MovieExtends-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d8e/classshaka_1_1AdaptationSet.html b/docs/d8/d8e/classshaka_1_1AdaptationSet.html
index 6df16bd758..0063b89610 100644
--- a/docs/d8/d8e/classshaka_1_1AdaptationSet.html
+++ b/docs/d8/d8e/classshaka_1_1AdaptationSet.html
@@ -167,7 +167,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> class provides methods to add Representations and &lt;ContentProtection&gt; elements to the <a class="el" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> element. </p>
 
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00167">167</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00165">165</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="acd24d0537c3625d709b58cf9565d8fcf"></a>
 <div class="memitem">
@@ -229,7 +229,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00674">674</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00671">671</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -263,7 +263,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00737">737</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00733">733</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -297,7 +297,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>On success, returns a pointer to <a class="el" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>. Otherwise returns NULL. The returned pointer is owned by the <a class="el" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> instance. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00693">693</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00689">689</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -330,7 +330,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00749">749</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00745">745</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -363,7 +363,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00836">836</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00833">833</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -382,7 +382,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 <p>Makes a copy of <a class="el" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> xml element with its child <a class="el" href="../../de/d52/classshaka_1_1Representation.html">Representation</a> and ContentProtection elements. </p>
 <dl class="section return"><dt>Returns</dt><dd>On success returns a non-NULL scoped_xml_ptr. Otherwise returns a NULL scoped_xml_ptr. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00759">759</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00755">755</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -408,7 +408,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>Returns the value for group. If not set, returns a negative value. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00846">846</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00843">843</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -451,7 +451,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00857">857</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00854">854</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -493,7 +493,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00868">868</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00865">865</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -526,7 +526,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00842">842</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00839">839</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -571,7 +571,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </dl>
 <dl class="section attention"><dt>Attention</dt><dd>This might get removed once DASH IF IOP specification makes a a clear guideline on how to handle key rotation. Also to get this working with shaka-player, this method <em>DOES NOT</em> update the PSSH element. Instead, it removes the element regardless of the content of <em>pssh</em>. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00743">743</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00739">739</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -582,7 +582,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d91/classshaka_1_1media_1_1AesCtrEncryptor-members.html b/docs/d8/d91/classshaka_1_1media_1_1AesCtrEncryptor-members.html
index a8803f09e9..343418811b 100644
--- a/docs/d8/d91/classshaka_1_1media_1_1AesCtrEncryptor-members.html
+++ b/docs/d8/d91/classshaka_1_1media_1_1AesCtrEncryptor-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d92/classshaka_1_1media_1_1AesRequestSigner-members.html b/docs/d8/d92/classshaka_1_1media_1_1AesRequestSigner-members.html
index 37064c198e..ef398badd5 100644
--- a/docs/d8/d92/classshaka_1_1media_1_1AesRequestSigner-members.html
+++ b/docs/d8/d92/classshaka_1_1media_1_1AesRequestSigner-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d92/structshaka_1_1media_1_1H264DecRefPicMarking-members.html b/docs/d8/d92/structshaka_1_1media_1_1H264DecRefPicMarking-members.html
index d9c39d496d..1ba02bc8e8 100644
--- a/docs/d8/d92/structshaka_1_1media_1_1H264DecRefPicMarking-members.html
+++ b/docs/d8/d92/structshaka_1_1media_1_1H264DecRefPicMarking-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d93/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader-members.html b/docs/d8/d93/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader-members.html
index 0ba2b716c8..68cba3310f 100644
--- a/docs/d8/d93/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader-members.html
+++ b/docs/d8/d93/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d94/adts__constants_8cc_source.html b/docs/d8/d94/adts__constants_8cc_source.html
index fe473e2117..aad07d2dcb 100644
--- a/docs/d8/d94/adts__constants_8cc_source.html
+++ b/docs/d8/d94/adts__constants_8cc_source.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d94/pes__packet_8h_source.html b/docs/d8/d94/pes__packet_8h_source.html
index 8e9c28bf34..cc207f44f3 100644
--- a/docs/d8/d94/pes__packet_8h_source.html
+++ b/docs/d8/d94/pes__packet_8h_source.html
@@ -159,7 +159,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d99/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox-members.html b/docs/d8/d99/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox-members.html
index 203ae49e22..d132bcd918 100644
--- a/docs/d8/d99/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox-members.html
+++ b/docs/d8/d99/structshaka_1_1media_1_1mp4_1_1VTTAdditionalTextBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d9a/fragmenter_8cc_source.html b/docs/d8/d9a/fragmenter_8cc_source.html
index d075e660c7..0c8cd4c4df 100644
--- a/docs/d8/d9a/fragmenter_8cc_source.html
+++ b/docs/d8/d9a/fragmenter_8cc_source.html
@@ -300,7 +300,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d9c/webm__tracks__parser_8cc_source.html b/docs/d8/d9c/webm__tracks__parser_8cc_source.html
index 9db6140307..3f84581cbf 100644
--- a/docs/d8/d9c/webm__tracks__parser_8cc_source.html
+++ b/docs/d8/d9c/webm__tracks__parser_8cc_source.html
@@ -430,9 +430,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMTracksParser_html_a554135ee3a8ad995beeab868c67aba36"><div class="ttname"><a href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#a554135ee3a8ad995beeab868c67aba36">shaka::media::WebMTracksParser::GetAudioDefaultDuration</a></div><div class="ttdeci">int64_t GetAudioDefaultDuration(const double timecode_scale_in_us) const </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d9c/webm__tracks__parser_8cc_source.html#l00090">webm_tracks_parser.cc:90</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMListParser_html"><div class="ttname"><a href="../../dc/dca/classshaka_1_1media_1_1WebMListParser.html">shaka::media::WebMListParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d46/webm__parser_8h_source.html#l00054">webm_parser.h:54</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00038">webm_video_client.cc:38</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00037">webm_video_client.cc:37</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMListParser_html_acd805b7eb25afcd9a3be2d8d88e3c6af"><div class="ttname"><a href="../../dc/dca/classshaka_1_1media_1_1WebMListParser.html#acd805b7eb25afcd9a3be2d8d88e3c6af">shaka::media::WebMListParser::Parse</a></div><div class="ttdeci">int Parse(const uint8_t *buf, int size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/db6/webm__parser_8cc_source.html#l00719">webm_parser.cc:719</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00051">webm_video_client.cc:51</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00050">webm_video_client.cc:50</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMTracksParser_html_aa4b6d4ac9fa57b47cbc17ee7c1bd3639"><div class="ttname"><a href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#aa4b6d4ac9fa57b47cbc17ee7c1bd3639">shaka::media::WebMTracksParser::Parse</a></div><div class="ttdeci">int Parse(const uint8_t *buf, int size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d9c/webm__tracks__parser_8cc_source.html#l00065">webm_tracks_parser.cc:65</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMAudioClient_html_afd1a338848c52dc4db79d89ae13b6ea6"><div class="ttname"><a href="../../d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html#afd1a338848c52dc4db79d89ae13b6ea6">shaka::media::WebMAudioClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new audio track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d8e/webm__audio__client_8cc_source.html#l00025">webm_audio_client.cc:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMListParser_html_acf786fc2e07143c3f1a481401240d105"><div class="ttname"><a href="../../dc/dca/classshaka_1_1media_1_1WebMListParser.html#acf786fc2e07143c3f1a481401240d105">shaka::media::WebMListParser::IsParsingComplete</a></div><div class="ttdeci">bool IsParsingComplete() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/db6/webm__parser_8cc_source.html#l00803">webm_parser.cc:803</a></div></div>
@@ -440,7 +440,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/d9f/udp__file_8h_source.html b/docs/d8/d9f/udp__file_8h_source.html
index 4b43a6df55..c51fb0d5c3 100644
--- a/docs/d8/d9f/udp__file_8h_source.html
+++ b/docs/d8/d9f/udp__file_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/da3/classshaka_1_1media_1_1DecryptorSource-members.html b/docs/d8/da3/classshaka_1_1media_1_1DecryptorSource-members.html
index ccf09d69a4..2ffd87c854 100644
--- a/docs/d8/da3/classshaka_1_1media_1_1DecryptorSource-members.html
+++ b/docs/d8/da3/classshaka_1_1media_1_1DecryptorSource-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/da5/structshaka_1_1media_1_1mp4_1_1SampleSize-members.html b/docs/d8/da5/structshaka_1_1media_1_1mp4_1_1SampleSize-members.html
index 94661912dd..fc92feeec2 100644
--- a/docs/d8/da5/structshaka_1_1media_1_1mp4_1_1SampleSize-members.html
+++ b/docs/d8/da5/structshaka_1_1media_1_1mp4_1_1SampleSize-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/da6/classshaka_1_1media_1_1NaluReader-members.html b/docs/d8/da6/classshaka_1_1media_1_1NaluReader-members.html
index 1f7178d5ce..ea89cdcef3 100644
--- a/docs/d8/da6/classshaka_1_1media_1_1NaluReader-members.html
+++ b/docs/d8/da6/classshaka_1_1media_1_1NaluReader-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/daa/stream__info_8h_source.html b/docs/d8/daa/stream__info_8h_source.html
index f8d38f2443..c1456b68b3 100644
--- a/docs/d8/daa/stream__info_8h_source.html
+++ b/docs/d8/daa/stream__info_8h_source.html
@@ -205,7 +205,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/daf/namespaceshaka.html b/docs/d8/daf/namespaceshaka.html
index 7cfe67dc55..af8b79e4a1 100644
--- a/docs/d8/daf/namespaceshaka.html
+++ b/docs/d8/daf/namespaceshaka.html
@@ -566,7 +566,7 @@ const char&#160;</td><td class="memItemRight" valign="bottom"><b>kPsshElementNam
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html b/docs/d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html
index 242eead571..112c5f9ebf 100644
--- a/docs/d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html
+++ b/docs/d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html
@@ -259,7 +259,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/db9/classshaka_1_1media_1_1WebMContentEncodingsClient-members.html b/docs/d8/db9/classshaka_1_1media_1_1WebMContentEncodingsClient-members.html
index 3789663095..83759de705 100644
--- a/docs/d8/db9/classshaka_1_1media_1_1WebMContentEncodingsClient-members.html
+++ b/docs/d8/db9/classshaka_1_1media_1_1WebMContentEncodingsClient-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dc2/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo.html b/docs/d8/dc2/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo.html
index 691aa3c3f2..b381f4a2f8 100644
--- a/docs/d8/dc2/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo.html
+++ b/docs/d8/dc2/structshaka_1_1media_1_1mp2t_1_1EsParserH26x_1_1VideoSliceInfo.html
@@ -118,7 +118,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>frame_num</b> = 0</td>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dc3/structshaka_1_1media_1_1mp4_1_1CueTimeBox.html b/docs/d8/dc3/structshaka_1_1media_1_1mp4_1_1CueTimeBox.html
index 7939cdebba..cab5cd0556 100644
--- a/docs/d8/dc3/structshaka_1_1media_1_1mp4_1_1CueTimeBox.html
+++ b/docs/d8/dc3/structshaka_1_1media_1_1mp4_1_1CueTimeBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dca/ts__writer_8h_source.html b/docs/d8/dca/ts__writer_8h_source.html
index 123e2870f7..544de8731b 100644
--- a/docs/d8/dca/ts__writer_8h_source.html
+++ b/docs/d8/dca/ts__writer_8h_source.html
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1DecodingTime-members.html b/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1DecodingTime-members.html
index 47c025bc98..68c87b16a4 100644
--- a/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1DecodingTime-members.html
+++ b/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1DecodingTime-members.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1TrackExtends-members.html b/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1TrackExtends-members.html
index 2673a20160..c8169703d6 100644
--- a/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1TrackExtends-members.html
+++ b/docs/d8/dcd/structshaka_1_1media_1_1mp4_1_1TrackExtends-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html b/docs/d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html
index ff333c84ff..355c28de53 100644
--- a/docs/d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html
+++ b/docs/d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html
@@ -129,7 +129,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dd6/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry.html b/docs/d8/dd6/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry.html
index ec9fa9fed1..41b4b73a7a 100644
--- a/docs/d8/dd6/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry.html
+++ b/docs/d8/dd6/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry.html
@@ -135,7 +135,7 @@ std::vector&lt; uint8_t &gt;&#160;</td><td class="memItemRight" valign="bottom">
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html b/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html
index aa26b0f1fd..40f29e1df2 100644
--- a/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html
+++ b/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html
@@ -187,7 +187,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#adfbafb780222d3799a53a0e061fb8e73">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00115">115</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00116">116</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -215,7 +215,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#af8149126f4793506bef385d067561dbf">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00128">128</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00129">129</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -244,7 +244,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#ad6171481d6fb437767b1f5b9e0dac1a3">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00034">34</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00035">35</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -305,7 +305,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#acf6a0bde4fc907053cc9f1ff9a38b59a">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00099">99</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00100">100</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -352,7 +352,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#ae10c06fe6022a1020fc889de389be430">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00038">38</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00039">39</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -413,7 +413,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a100236a249477afcda4f50e4914f0eee">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00085">85</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00086">86</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -460,7 +460,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 
 <p>Implements <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#a721edf600dc9165e96e4b6c154a2d4f6">shaka::MpdNotifier</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00073">73</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html#l00074">74</a> of file <a class="el" href="../../d2/d7b/simple__mpd__notifier_8cc_source.html">simple_mpd_notifier.cc</a>.</p>
 
 </div>
 </div>
@@ -471,7 +471,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>SimpleMpdNotifierTes
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/de6/webm__crypto__helpers_8h_source.html b/docs/d8/de6/webm__crypto__helpers_8h_source.html
index 86612cbc96..9620ba1b14 100644
--- a/docs/d8/de6/webm__crypto__helpers_8h_source.html
+++ b/docs/d8/de6/webm__crypto__helpers_8h_source.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/deb/classshaka_1_1media_1_1mp2t_1_1EsParser-members.html b/docs/d8/deb/classshaka_1_1media_1_1mp2t_1_1EsParser-members.html
index 0e414a25cb..b7304bb914 100644
--- a/docs/d8/deb/classshaka_1_1media_1_1mp2t_1_1EsParser-members.html
+++ b/docs/d8/deb/classshaka_1_1media_1_1mp2t_1_1EsParser-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dee/classshaka_1_1media_1_1AudioTimestampHelper-members.html b/docs/d8/dee/classshaka_1_1media_1_1AudioTimestampHelper-members.html
index bfd1718f8f..43909cf19a 100644
--- a/docs/d8/dee/classshaka_1_1media_1_1AudioTimestampHelper-members.html
+++ b/docs/d8/dee/classshaka_1_1media_1_1AudioTimestampHelper-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dee/classshaka_1_1media_1_1VPxParser-members.html b/docs/d8/dee/classshaka_1_1media_1_1VPxParser-members.html
index dc8f8a8fa0..bcaa4523da 100644
--- a/docs/d8/dee/classshaka_1_1media_1_1VPxParser-members.html
+++ b/docs/d8/dee/classshaka_1_1media_1_1VPxParser-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html b/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html
index c768e6045f..b848191751 100644
--- a/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html
+++ b/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html
@@ -181,7 +181,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html b/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html
index c59fffe8fc..9c6f227c20 100644
--- a/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html
+++ b/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d8/dfa/nal__unit__to__byte__stream__converter_8h_source.html b/docs/d8/dfa/nal__unit__to__byte__stream__converter_8h_source.html
index e7dc4ca433..477fcae2d6 100644
--- a/docs/d8/dfa/nal__unit__to__byte__stream__converter_8h_source.html
+++ b/docs/d8/dfa/nal__unit__to__byte__stream__converter_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d00/structshaka_1_1media_1_1OnMediaEndParameters-members.html b/docs/d9/d00/structshaka_1_1media_1_1OnMediaEndParameters-members.html
index 8103e9dc91..58bf1d43cd 100644
--- a/docs/d9/d00/structshaka_1_1media_1_1OnMediaEndParameters-members.html
+++ b/docs/d9/d00/structshaka_1_1media_1_1OnMediaEndParameters-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html b/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html
index bc0f8cfc41..109fbbca84 100644
--- a/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html
+++ b/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d08/mock__mpd__builder_8h_source.html b/docs/d9/d08/mock__mpd__builder_8h_source.html
index 2fdc991d11..658943b685 100644
--- a/docs/d9/d08/mock__mpd__builder_8h_source.html
+++ b/docs/d9/d08/mock__mpd__builder_8h_source.html
@@ -156,31 +156,31 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
 <div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_MOCK_MPD_BUILDER_H_</span></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01104">mpd_builder.cc:1104</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01100">mpd_builder.cc:1100</a></div></div>
 <div class="ttc" id="classshaka_1_1MockAdaptationSet_html"><div class="ttname"><a href="../../db/d4b/classshaka_1_1MockAdaptationSet.html">shaka::MockAdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d08/mock__mpd__builder_8h_source.html#l00030">mock_mpd_builder.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01128">mpd_builder.cc:1128</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00693">mpd_builder.cc:693</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00058">mpd_builder.h:58</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01124">mpd_builder.cc:1124</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00689">mpd_builder.cc:689</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></div><div class="ttdoc">This class generates DASH MPDs (Media Presentation Descriptions). </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00057">mpd_builder.h:57</a></div></div>
 <div class="ttc" id="classshaka_1_1MockMpdBuilder_html"><div class="ttname"><a href="../../df/d60/classshaka_1_1MockMpdBuilder.html">shaka::MockMpdBuilder</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d08/mock__mpd__builder_8h_source.html#l00019">mock_mpd_builder.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00737">mpd_builder.cc:737</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00733">mpd_builder.cc:733</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00749">mpd_builder.cc:749</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00743">mpd_builder.cc:743</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_adf8a48afbb29f1f1c54e4daaebb81337"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">shaka::MpdBuilder::type</a></div><div class="ttdeci">MpdType type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00093">mpd_builder.h:93</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00842">mpd_builder.cc:842</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00428">mpd_builder.cc:428</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00836">mpd_builder.cc:836</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01092">mpd_builder.cc:1092</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00413">mpd_builder.cc:413</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00846">mpd_builder.cc:846</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00745">mpd_builder.cc:745</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00739">mpd_builder.cc:739</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_adf8a48afbb29f1f1c54e4daaebb81337"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">shaka::MpdBuilder::type</a></div><div class="ttdeci">MpdType type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00092">mpd_builder.h:92</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00839">mpd_builder.cc:839</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00427">mpd_builder.cc:427</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00833">mpd_builder.cc:833</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01088">mpd_builder.cc:1088</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00412">mpd_builder.cc:412</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00843">mpd_builder.cc:843</a></div></div>
 <div class="ttc" id="classshaka_1_1MockRepresentation_html"><div class="ttname"><a href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d08/mock__mpd__builder_8h_source.html#l00052">mock_mpd_builder.h:52</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01098">mpd_builder.cc:1098</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01094">mpd_builder.cc:1094</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d0b/classshaka_1_1media_1_1HlsNotifyMuxerListener-members.html b/docs/d9/d0b/classshaka_1_1media_1_1HlsNotifyMuxerListener-members.html
index da9d9d91af..087e0c07b2 100644
--- a/docs/d9/d0b/classshaka_1_1media_1_1HlsNotifyMuxerListener-members.html
+++ b/docs/d9/d0b/classshaka_1_1media_1_1HlsNotifyMuxerListener-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html b/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html
index 478335a052..ed2a537682 100644
--- a/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html
+++ b/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html
@@ -141,7 +141,7 @@ Static Public Member Functions</h2></td></tr>
 <p>Create an <a class="el" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html" title="Rsa public key, used for signature verification and encryption. ">RsaPublicKey</a> object using a DER encoded PKCS#1 RSAPublicKey. </p>
 <dl class="section return"><dt>Returns</dt><dd>The created <a class="el" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html" title="Rsa private key, used for message signing and decryption. ">RsaPrivateKey</a> object on success, NULL otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00180">180</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00171">171</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -177,7 +177,7 @@ Static Public Member Functions</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successful, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00185">185</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00176">176</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -207,7 +207,7 @@ Static Public Member Functions</h2></td></tr>
 <p>Verify RSASSA-PSS signature. </p>
 <dl class="section return"><dt>Returns</dt><dd>true if verification succeeds, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00210">210</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html#l00200">200</a> of file <a class="el" href="../../dc/dd9/rsa__key_8cc_source.html">rsa_key.cc</a>.</p>
 
 </div>
 </div>
@@ -218,7 +218,7 @@ Static Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d13/classshaka_1_1media_1_1BufferReader.html b/docs/d9/d13/classshaka_1_1media_1_1BufferReader.html
index 08860ed33c..442ec3dfac 100644
--- a/docs/d9/d13/classshaka_1_1media_1_1BufferReader.html
+++ b/docs/d9/d13/classshaka_1_1media_1_1BufferReader.html
@@ -276,7 +276,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>ReadNBytesInto8s</b>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d15/key__rotation__fragmenter_8cc_source.html b/docs/d9/d15/key__rotation__fragmenter_8cc_source.html
index 4ff1e44782..91f75a7dc5 100644
--- a/docs/d9/d15/key__rotation__fragmenter_8cc_source.html
+++ b/docs/d9/d15/key__rotation__fragmenter_8cc_source.html
@@ -231,7 +231,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_a18806b962c858e35ed07753687605b16"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16">shaka::media::KeySource::GetCryptoPeriodKey</a></div><div class="ttdeci">virtual Status GetCryptoPeriodKey(uint32_t crypto_period_index, TrackType track_type, EncryptionKey *key)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">aes_cryptor.cc:109</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a40d9a82d274d6fbaee5346328f11dedd"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a40d9a82d274d6fbaee5346328f11dedd">shaka::media::AesCryptor::GenerateRandomIv</a></div><div class="ttdeci">static bool GenerateRandomIv(FourCC protection_scheme, std::vector&lt; uint8_t &gt; *iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">aes_cryptor.cc:107</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1MovieFragment_html"><div class="ttname"><a href="../../d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html">shaka::media::mp4::MovieFragment</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00742">box_definitions.h:742</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></div><div class="ttdoc">EncryptingFragmenter generates MP4 fragments with sample encrypted. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/dcb/encrypting__fragmenter_8h_source.html#l00028">encrypting_fragmenter.h:28</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
@@ -244,7 +244,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html b/docs/d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html
index 7d780c7978..8aa2e2a2b8 100644
--- a/docs/d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html
+++ b/docs/d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html
@@ -180,7 +180,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d26/classshaka_1_1media_1_1AesEncryptor-members.html b/docs/d9/d26/classshaka_1_1media_1_1AesEncryptor-members.html
index ca2358ce6d..5a53953ba1 100644
--- a/docs/d9/d26/classshaka_1_1media_1_1AesEncryptor-members.html
+++ b/docs/d9/d26/classshaka_1_1media_1_1AesEncryptor-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html b/docs/d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html
index fd8e8a9254..d8e333b884 100644
--- a/docs/d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html
+++ b/docs/d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html
@@ -203,7 +203,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>OK on success, an error status otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00322">322</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00320">320</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -240,7 +240,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>The total length, in seconds, of segmented media files. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00380">380</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00378">378</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -393,7 +393,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>OK on success, an error status otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00166">166</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00165">165</a> of file <a class="el" href="../../d2/da8/mp4_2segmenter_8cc_source.html">segmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -430,7 +430,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_progress_target</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d36/classshaka_1_1media_1_1TracksBuilder-members.html b/docs/d9/d36/classshaka_1_1media_1_1TracksBuilder-members.html
index 80d678663f..db6ae4c8b7 100644
--- a/docs/d9/d36/classshaka_1_1media_1_1TracksBuilder-members.html
+++ b/docs/d9/d36/classshaka_1_1media_1_1TracksBuilder-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d3a/classshaka_1_1media_1_1File-members.html b/docs/d9/d3a/classshaka_1_1media_1_1File-members.html
index 4bdaa5ee3a..b6ac278985 100644
--- a/docs/d9/d3a/classshaka_1_1media_1_1File-members.html
+++ b/docs/d9/d3a/classshaka_1_1media_1_1File-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d3b/webm__content__encodings_8h_source.html b/docs/d9/d3b/webm__content__encodings_8h_source.html
index 8bcae58b13..c58c0f9370 100644
--- a/docs/d9/d3b/webm__content__encodings_8h_source.html
+++ b/docs/d9/d3b/webm__content__encodings_8h_source.html
@@ -178,7 +178,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d3c/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox.html b/docs/d9/d3c/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox.html
index 07b139f15e..d96e8e266c 100644
--- a/docs/d9/d3c/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox.html
+++ b/docs/d9/d3c/structshaka_1_1media_1_1mp4_1_1VTTEmptyCueBox.html
@@ -166,7 +166,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d3e/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox.html b/docs/d9/d3e/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox.html
index 9c8f1f25e0..21a6797bb6 100644
--- a/docs/d9/d3e/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox.html
+++ b/docs/d9/d3e/structshaka_1_1media_1_1mp4_1_1CueSourceIDBox.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html b/docs/d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html
index 7f0df56998..ddfb509410 100644
--- a/docs/d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html
+++ b/docs/d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html
@@ -320,7 +320,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d66/classshaka_1_1media_1_1mp2t_1_1EsParserAdts-members.html b/docs/d9/d66/classshaka_1_1media_1_1mp2t_1_1EsParserAdts-members.html
index c1afb201f3..6ce8d8d810 100644
--- a/docs/d9/d66/classshaka_1_1media_1_1mp2t_1_1EsParserAdts-members.html
+++ b/docs/d9/d66/classshaka_1_1media_1_1mp2t_1_1EsParserAdts-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d67/structshaka_1_1media_1_1H265VuiParameters.html b/docs/d9/d67/structshaka_1_1media_1_1H265VuiParameters.html
index 2b20074754..bb4eb02fea 100644
--- a/docs/d9/d67/structshaka_1_1media_1_1H265VuiParameters.html
+++ b/docs/d9/d67/structshaka_1_1media_1_1H265VuiParameters.html
@@ -131,7 +131,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>min_spatial_segmentati
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d6a/structshaka_1_1media_1_1H264SliceHeader-members.html b/docs/d9/d6a/structshaka_1_1media_1_1H264SliceHeader-members.html
index 53955ec9e5..0c90ac1b0e 100644
--- a/docs/d9/d6a/structshaka_1_1media_1_1H264SliceHeader-members.html
+++ b/docs/d9/d6a/structshaka_1_1media_1_1H264SliceHeader-members.html
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d76/ts__muxer_8cc_source.html b/docs/d9/d76/ts__muxer_8cc_source.html
index fa93dc1bae..fb36235177 100644
--- a/docs/d9/d76/ts__muxer_8cc_source.html
+++ b/docs/d9/d76/ts__muxer_8cc_source.html
@@ -155,7 +155,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d81/classshaka_1_1media_1_1ClosureThread-members.html b/docs/d9/d81/classshaka_1_1media_1_1ClosureThread-members.html
index 7e1244d59b..ee6418ee75 100644
--- a/docs/d9/d81/classshaka_1_1media_1_1ClosureThread-members.html
+++ b/docs/d9/d81/classshaka_1_1media_1_1ClosureThread-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d86/limits_8h_source.html b/docs/d9/d86/limits_8h_source.html
index a8832db5f0..7d3a0b4a25 100644
--- a/docs/d9/d86/limits_8h_source.html
+++ b/docs/d9/d86/limits_8h_source.html
@@ -141,7 +141,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html b/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html
index c2afde558e..e626998a52 100644
--- a/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html
+++ b/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html
@@ -144,7 +144,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Parser for WebM ContentEncodings element. </p>
 
-<p>Definition at line <a class="el" href="../../d8/d33/webm__content__encodings__client_8h_source.html#l00022">22</a> of file <a class="el" href="../../d8/d33/webm__content__encodings__client_8h_source.html">webm_content_encodings_client.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d8/d33/webm__content__encodings__client_8h_source.html#l00021">21</a> of file <a class="el" href="../../d8/d33/webm__content__encodings__client_8h_source.html">webm_content_encodings_client.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/formats/webm/<a class="el" href="../../d8/d33/webm__content__encodings__client_8h_source.html">webm_content_encodings_client.h</a></li>
 <li>media/formats/webm/<a class="el" href="../../de/d77/webm__content__encodings__client_8cc_source.html">webm_content_encodings_client.cc</a></li>
@@ -152,7 +152,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html b/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html
index 6163811422..4eb374b44b 100644
--- a/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html
+++ b/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html
@@ -188,7 +188,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d90/classshaka_1_1media_1_1ProtectionSystemSpecificInfo-members.html b/docs/d9/d90/classshaka_1_1media_1_1ProtectionSystemSpecificInfo-members.html
index 01c8d37022..24414d56d9 100644
--- a/docs/d9/d90/classshaka_1_1media_1_1ProtectionSystemSpecificInfo-members.html
+++ b/docs/d9/d90/classshaka_1_1media_1_1ProtectionSystemSpecificInfo-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d90/text__track_8h_source.html b/docs/d9/d90/text__track_8h_source.html
index a300a97f4a..9128311d71 100644
--- a/docs/d9/d90/text__track_8h_source.html
+++ b/docs/d9/d90/text__track_8h_source.html
@@ -134,7 +134,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/d93/media__stream_8h_source.html b/docs/d9/d93/media__stream_8h_source.html
index 6e5b1e5a73..2527d2710a 100644
--- a/docs/d9/d93/media__stream_8h_source.html
+++ b/docs/d9/d93/media__stream_8h_source.html
@@ -170,7 +170,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/da4/stream__descriptor_8h_source.html b/docs/d9/da4/stream__descriptor_8h_source.html
index e91e63d2e1..8f6fa148a0 100644
--- a/docs/d9/da4/stream__descriptor_8h_source.html
+++ b/docs/d9/da4/stream__descriptor_8h_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html b/docs/d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html
index 9bb78229ee..3380838161 100644
--- a/docs/d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html
+++ b/docs/d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html
@@ -513,7 +513,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/da6/structshaka_1_1media_1_1Cue-members.html b/docs/d9/da6/structshaka_1_1media_1_1Cue-members.html
index 96b5b6fe9b..62ce502d48 100644
--- a/docs/d9/da6/structshaka_1_1media_1_1Cue-members.html
+++ b/docs/d9/da6/structshaka_1_1media_1_1Cue-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/da7/classshaka_1_1media_1_1mp4_1_1Segmenter-members.html b/docs/d9/da7/classshaka_1_1media_1_1mp4_1_1Segmenter-members.html
index 74ddfffe44..9a971c3163 100644
--- a/docs/d9/da7/classshaka_1_1media_1_1mp4_1_1Segmenter-members.html
+++ b/docs/d9/da7/classshaka_1_1media_1_1mp4_1_1Segmenter-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/db2/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator-members.html b/docs/d9/db2/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator-members.html
index afa83d2b8e..d12c90c96c 100644
--- a/docs/d9/db2/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator-members.html
+++ b/docs/d9/db2/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/db9/content__protection__element_8cc_source.html b/docs/d9/db9/content__protection__element_8cc_source.html
index e10091fe23..eb09ebf149 100644
--- a/docs/d9/db9/content__protection__element_8cc_source.html
+++ b/docs/d9/db9/content__protection__element_8cc_source.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/db9/muxer_8cc_source.html b/docs/d9/db9/muxer_8cc_source.html
index 0c814192e6..a6b2e6e86a 100644
--- a/docs/d9/db9/muxer_8cc_source.html
+++ b/docs/d9/db9/muxer_8cc_source.html
@@ -220,7 +220,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dbd/classshaka_1_1media_1_1MemoryFile.html b/docs/d9/dbd/classshaka_1_1media_1_1MemoryFile.html
index 6dd15c454e..73ac94c517 100644
--- a/docs/d9/dbd/classshaka_1_1media_1_1MemoryFile.html
+++ b/docs/d9/dbd/classshaka_1_1media_1_1MemoryFile.html
@@ -485,7 +485,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dc4/classshaka_1_1media_1_1BufferReader-members.html b/docs/d9/dc4/classshaka_1_1media_1_1BufferReader-members.html
index db2c7f943f..223af9042a 100644
--- a/docs/d9/dc4/classshaka_1_1media_1_1BufferReader-members.html
+++ b/docs/d9/dc4/classshaka_1_1media_1_1BufferReader-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dc4/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry-members.html b/docs/d9/dc4/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry-members.html
index d96ff4e3df..77141a1568 100644
--- a/docs/d9/dc4/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry-members.html
+++ b/docs/d9/dc4/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dc8/webm__constants_8cc_source.html b/docs/d9/dc8/webm__constants_8cc_source.html
index 5b4a24f56a..043fba97ee 100644
--- a/docs/d9/dc8/webm__constants_8cc_source.html
+++ b/docs/d9/dc8/webm__constants_8cc_source.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dcc/webm__video__client_8h_source.html b/docs/d9/dcc/webm__video__client_8h_source.html
index bc9d7f2003..96af956c6a 100644
--- a/docs/d9/dcc/webm__video__client_8h_source.html
+++ b/docs/d9/dcc/webm__video__client_8h_source.html
@@ -142,14 +142,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00038">webm_video_client.cc:38</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_af3ad16a6046f60abf43a798747fc1edc"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc">shaka::media::WebMVideoClient::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset this object&#39;s state so it can process a new video track element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00037">webm_video_client.cc:37</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html">shaka::media::WebMVideoClient</a></div><div class="ttdoc">Helper class used to parse a Video element inside a TrackEntry element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/dcc/webm__video__client_8h_source.html#l00020">webm_video_client.h:20</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00051">webm_video_client.cc:51</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMVideoClient_html_a266f4308e70a1b7c1fb2a542284f9bea"><div class="ttname"><a href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#a266f4308e70a1b7c1fb2a542284f9bea">shaka::media::WebMVideoClient::GetVideoStreamInfo</a></div><div class="ttdeci">scoped_refptr&lt; VideoStreamInfo &gt; GetVideoStreamInfo(int64_t track_num, const std::string &amp;codec_id, const std::vector&lt; uint8_t &gt; &amp;codec_private, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d7d/webm__video__client_8cc_source.html#l00050">webm_video_client.cc:50</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMParserClient_html"><div class="ttname"><a href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">shaka::media::WebMParserClient</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d46/webm__parser_8h_source.html#l00030">webm_parser.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/de3/muxer__listener__internal_8cc_source.html b/docs/d9/de3/muxer__listener__internal_8cc_source.html
index 7dbd3f7574..9fe9384172 100644
--- a/docs/d9/de3/muxer__listener__internal_8cc_source.html
+++ b/docs/d9/de3/muxer__listener__internal_8cc_source.html
@@ -348,7 +348,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/de6/classshaka_1_1media_1_1LocalFile.html b/docs/d9/de6/classshaka_1_1media_1_1LocalFile.html
index 281b9069d7..c5dc3d9736 100644
--- a/docs/d9/de6/classshaka_1_1media_1_1LocalFile.html
+++ b/docs/d9/de6/classshaka_1_1media_1_1LocalFile.html
@@ -502,7 +502,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html b/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html
index 6f8e61a521..4f6c55e115 100644
--- a/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html
+++ b/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/ded/aac__audio__specific__config_8cc_source.html b/docs/d9/ded/aac__audio__specific__config_8cc_source.html
index 1e747f7b0a..90247cb78d 100644
--- a/docs/d9/ded/aac__audio__specific__config_8cc_source.html
+++ b/docs/d9/ded/aac__audio__specific__config_8cc_source.html
@@ -358,7 +358,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/df8/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime-members.html b/docs/d9/df8/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime-members.html
index 251ca96e05..75bfaee534 100644
--- a/docs/d9/df8/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime-members.html
+++ b/docs/d9/df8/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html b/docs/d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html
index 4fbd2f0f97..09996318f7 100644
--- a/docs/d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html
+++ b/docs/d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html
@@ -242,7 +242,7 @@ false if <em>max_offset</em> &gt; <a class="el" href="../../d9/df9/classshaka_1_
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html b/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html
index 30d54604d5..2e10051e49 100644
--- a/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html
+++ b/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html
@@ -112,14 +112,14 @@ union {</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00118">118</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00119">119</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d04/audio__stream__info_8cc_source.html b/docs/da/d04/audio__stream__info_8cc_source.html
index 525f52fa08..c56dacc489 100644
--- a/docs/da/d04/audio__stream__info_8cc_source.html
+++ b/docs/da/d04/audio__stream__info_8cc_source.html
@@ -223,7 +223,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html b/docs/da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html
index 225e267d94..4dfabe4421 100644
--- a/docs/da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html
+++ b/docs/da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html
@@ -146,7 +146,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>pid</b> ()</td></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d1a/structshaka_1_1media_1_1mp4_1_1Language.html b/docs/da/d1a/structshaka_1_1media_1_1mp4_1_1Language.html
index 13c3937e1a..3d3bffb27f 100644
--- a/docs/da/d1a/structshaka_1_1media_1_1mp4_1_1Language.html
+++ b/docs/da/d1a/structshaka_1_1media_1_1mp4_1_1Language.html
@@ -120,7 +120,7 @@ std::string&#160;</td><td class="memItemRight" valign="bottom"><b>code</b></td><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html b/docs/da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html
index bd4419666b..3b965b4881 100644
--- a/docs/da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html
+++ b/docs/da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html
@@ -141,7 +141,7 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>Reset</b> ()=
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d22/key__rotation__fragmenter_8h_source.html b/docs/da/d22/key__rotation__fragmenter_8h_source.html
index 61e6c13122..c64a3c8f1f 100644
--- a/docs/da/d22/key__rotation__fragmenter_8h_source.html
+++ b/docs/da/d22/key__rotation__fragmenter_8h_source.html
@@ -156,7 +156,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html b/docs/da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html
index e1e37955fd..9b3bd57b16 100644
--- a/docs/da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html
+++ b/docs/da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html
@@ -164,7 +164,7 @@ const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d23/ts__muxer_8h_source.html b/docs/da/d23/ts__muxer_8h_source.html
index db11965622..85b69f18de 100644
--- a/docs/da/d23/ts__muxer_8h_source.html
+++ b/docs/da/d23/ts__muxer_8h_source.html
@@ -137,7 +137,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d24/h265__parser_8h_source.html b/docs/da/d24/h265__parser_8h_source.html
index 224a0b5c3a..7e31b7c3af 100644
--- a/docs/da/d24/h265__parser_8h_source.html
+++ b/docs/da/d24/h265__parser_8h_source.html
@@ -419,8 +419,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;                                   <span class="keywordtype">bool</span> sub_pic_hdr_params_present_flag,</div>
 <div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;                                   <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br);</div>
 <div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, H265Sps*&gt; SpsById;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, H265Pps*&gt; PpsById;</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, std::unique_ptr&lt;H265Sps&gt;&gt; SpsById;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, std::unique_ptr&lt;H265Pps&gt;&gt; PpsById;</div>
 <div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;</div>
 <div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  SpsById active_spses_;</div>
 <div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  PpsById active_ppses_;</div>
@@ -434,23 +434,23 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;<span class="preprocessor">#endif  // MEDIA_CODECS_H265_PARSER_H_</span></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265VuiParameters_html"><div class="ttname"><a href="../../d9/d67/structshaka_1_1media_1_1H265VuiParameters.html">shaka::media::H265VuiParameters</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00046">h265_parser.h:46</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265Pps_html"><div class="ttname"><a href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">shaka::media::H265Pps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00060">h265_parser.h:60</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00187">h265_parser.cc:187</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00183">h265_parser.cc:183</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265Sps_html"><div class="ttname"><a href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">shaka::media::H265Sps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00121">h265_parser.h:121</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265ReferencePictureListModifications_html"><div class="ttname"><a href="../../d5/d9d/structshaka_1_1media_1_1H265ReferencePictureListModifications.html">shaka::media::H265ReferencePictureListModifications</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00195">h265_parser.h:195</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00404">h265_parser.cc:404</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00400">h265_parser.cc:400</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265SliceHeader_html"><div class="ttname"><a href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">shaka::media::H265SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00206">h265_parser.h:206</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">shaka::media::Nalu</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00026">nalu_reader.h:26</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00634">h265_parser.cc:634</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00628">h265_parser.cc:628</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H265Parser_html"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html">shaka::media::H265Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00277">h265_parser.h:277</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_af4a103a131c849bf54018b747dbdd80c"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">shaka::media::H265Parser::GetPps</a></div><div class="ttdeci">const H265Pps * GetPps(int pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00630">h265_parser.cc:630</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_af4a103a131c849bf54018b747dbdd80c"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">shaka::media::H265Parser::GetPps</a></div><div class="ttdeci">const H265Pps * GetPps(int pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00624">h265_parser.cc:624</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H26xBitReader_html"><div class="ttname"><a href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">shaka::media::H26xBitReader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/dc2/h26x__bit__reader_8h_source.html#l00022">h26x_bit_reader.h:22</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00513">h265_parser.cc:513</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00508">h265_parser.cc:508</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265ReferencePictureSet_html"><div class="ttname"><a href="../../d5/dad/structshaka_1_1media_1_1H265ReferencePictureSet.html">shaka::media::H265ReferencePictureSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00035">h265_parser.h:35</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo_html"><div class="ttname"><a href="../../d7/d9c/structshaka_1_1media_1_1H265SliceHeader_1_1LongTermPicsInfo.html">shaka::media::H265SliceHeader::LongTermPicsInfo</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00210">h265_parser.h:210</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d2a/text__stream__info_8h_source.html b/docs/da/d2a/text__stream__info_8h_source.html
index dbb385f0d8..7b9181409b 100644
--- a/docs/da/d2a/text__stream__info_8h_source.html
+++ b/docs/da/d2a/text__stream__info_8h_source.html
@@ -136,7 +136,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d2d/classshaka_1_1media_1_1webm_1_1WebMMuxer-members.html b/docs/da/d2d/classshaka_1_1media_1_1webm_1_1WebMMuxer-members.html
index 45b5d2f88e..60e9e4772c 100644
--- a/docs/da/d2d/classshaka_1_1media_1_1webm_1_1WebMMuxer-members.html
+++ b/docs/da/d2d/classshaka_1_1media_1_1webm_1_1WebMMuxer-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d3e/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio-members.html b/docs/da/d3e/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio-members.html
index 9f034896b0..f8cfcab5b0 100644
--- a/docs/da/d3e/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio-members.html
+++ b/docs/da/d3e/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html b/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html
index 2c92d307a4..1d008be00f 100644
--- a/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html
+++ b/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html
@@ -143,7 +143,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d43/structshaka_1_1ContentProtectionElement.html b/docs/da/d43/structshaka_1_1ContentProtectionElement.html
index ec5ce194a1..b41d8d6f97 100644
--- a/docs/da/d43/structshaka_1_1ContentProtectionElement.html
+++ b/docs/da/d43/structshaka_1_1ContentProtectionElement.html
@@ -123,7 +123,7 @@ std::vector&lt; <a class="el" href="../../de/da9/structshaka_1_1Element.html">El
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html b/docs/da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html
index 882e7f6d71..b911ea0ad6 100644
--- a/docs/da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html
+++ b/docs/da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html
@@ -313,7 +313,7 @@ Static Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d50/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader.html b/docs/da/d50/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader.html
index 1f6d39d871..2f915ef4ab 100644
--- a/docs/da/d50/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader.html
+++ b/docs/da/d50/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d53/es__parser__h265_8cc_source.html b/docs/da/d53/es__parser__h265_8cc_source.html
index 1fada0743c..235ae9865b 100644
--- a/docs/da/d53/es__parser__h265_8cc_source.html
+++ b/docs/da/d53/es__parser__h265_8cc_source.html
@@ -259,7 +259,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d59/structshaka_1_1media_1_1mp4_1_1CompactSampleSize.html b/docs/da/d59/structshaka_1_1media_1_1mp4_1_1CompactSampleSize.html
index 8bddfc2760..d8134ffd74 100644
--- a/docs/da/d59/structshaka_1_1media_1_1mp4_1_1CompactSampleSize.html
+++ b/docs/da/d59/structshaka_1_1media_1_1mp4_1_1CompactSampleSize.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d5c/widevine__key__source_8h_source.html b/docs/da/d5c/widevine__key__source_8h_source.html
index 01bcbde0bc..b0d76035ba 100644
--- a/docs/da/d5c/widevine__key__source_8h_source.html
+++ b/docs/da/d5c/widevine__key__source_8h_source.html
@@ -142,7 +142,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;   <a class="code" href="../../dc/df0/classshaka_1_1media_1_1ClosureThread.html">ClosureThread</a> key_production_thread_;</div>
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
 <div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keyword">typedef</span> std::map&lt;TrackType, EncryptionKey*&gt; EncryptionKeyMap;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keyword">typedef</span> std::map&lt;TrackType, std::unique_ptr&lt;EncryptionKey&gt;&gt; EncryptionKeyMap;</div>
 <div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keyword">class </span>RefCountedEncryptionKeyMap;</div>
 <div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keyword">typedef</span> <a class="code" href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">ProducerConsumerQueue&lt;scoped_refptr&lt;RefCountedEncryptionKeyMap&gt;</a> &gt;</div>
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;      <a class="code" href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">EncryptionKeyQueue</a>;</div>
@@ -207,22 +207,22 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
 <div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ae6490d21a6538b9c909fdf996398e576"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">shaka::media::WidevineKeySource::FetchKeys</a></div><div class="ttdeci">Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00176">widevine_key_source.cc:176</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ab56a71e9f9f9e545f96e667279c05bb1"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">shaka::media::WidevineKeySource::GetCryptoPeriodKey</a></div><div class="ttdeci">Status GetCryptoPeriodKey(uint32_t crypto_period_index, TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00259">widevine_key_source.cc:259</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a59a16d61c6a6d05745e8b49fd3618deb"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">shaka::media::WidevineKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00233">widevine_key_source.cc:233</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ae6490d21a6538b9c909fdf996398e576"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">shaka::media::WidevineKeySource::FetchKeys</a></div><div class="ttdeci">Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00172">widevine_key_source.cc:172</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_ab56a71e9f9f9e545f96e667279c05bb1"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1">shaka::media::WidevineKeySource::GetCryptoPeriodKey</a></div><div class="ttdeci">Status GetCryptoPeriodKey(uint32_t crypto_period_index, TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00252">widevine_key_source.cc:252</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a59a16d61c6a6d05745e8b49fd3618deb"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb">shaka::media::WidevineKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00229">widevine_key_source.cc:229</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProducerConsumerQueue_html"><div class="ttname"><a href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">shaka::media::ProducerConsumerQueue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d15/producer__consumer__queue_8h_source.html#l00028">producer_consumer_queue.h:28</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d5c/widevine__key__source_8h_source.html#l00030">widevine_key_source.h:30</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1EncryptionKey_html"><div class="ttname"><a href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">shaka::media::EncryptionKey</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00019">key_source.h:19</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a97c0565df9381e178ebb50c193cebd04"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(std::unique_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00285">widevine_key_source.cc:285</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a93480a98e423d0456482844ac629bd2e"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">shaka::media::WidevineKeySource::WidevineKeySource</a></div><div class="ttdeci">WidevineKeySource(const std::string &amp;server_url, bool add_common_pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00137">widevine_key_source.cc:137</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a97c0565df9381e178ebb50c193cebd04"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(std::unique_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00278">widevine_key_source.cc:278</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a93480a98e423d0456482844ac629bd2e"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">shaka::media::WidevineKeySource::WidevineKeySource</a></div><div class="ttdeci">WidevineKeySource(const std::string &amp;server_url, bool add_common_pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00134">widevine_key_source.cc:134</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ClosureThread_html"><div class="ttname"><a href="../../dc/df0/classshaka_1_1media_1_1ClosureThread.html">shaka::media::ClosureThread</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/df8/closure__thread_8h_source.html#l00025">closure_thread.h:25</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a48d182da15ecc85e2ae7fd164ba0a526"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(std::unique_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00281">widevine_key_source.cc:281</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_a48d182da15ecc85e2ae7fd164ba0a526"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(std::unique_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00274">widevine_key_source.cc:274</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d5e/classshaka_1_1media_1_1H264VideoSliceHeaderParser-members.html b/docs/da/d5e/classshaka_1_1media_1_1H264VideoSliceHeaderParser-members.html
index bc392ff2e0..e4325dfc26 100644
--- a/docs/da/d5e/classshaka_1_1media_1_1H264VideoSliceHeaderParser-members.html
+++ b/docs/da/d5e/classshaka_1_1media_1_1H264VideoSliceHeaderParser-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d60/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter-members.html b/docs/da/d60/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter-members.html
index 4f52cf5d64..bee8e5beb5 100644
--- a/docs/da/d60/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter-members.html
+++ b/docs/da/d60/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d64/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter-members.html b/docs/da/d64/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter-members.html
index 093c7071bc..b18a7910a9 100644
--- a/docs/da/d64/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter-members.html
+++ b/docs/da/d64/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d6e/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry.html b/docs/da/d6e/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry.html
index b0b6f5bf65..eb41ddc1a8 100644
--- a/docs/da/d6e/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry.html
+++ b/docs/da/d6e/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry.html
@@ -120,7 +120,7 @@ int16_t&#160;</td><td class="memItemRight" valign="bottom"><b>roll_distance</b><
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d7a/fixed__key__encryption__flags_8h_source.html b/docs/da/d7a/fixed__key__encryption__flags_8h_source.html
index ce693195fc..4774dcd349 100644
--- a/docs/da/d7a/fixed__key__encryption__flags_8h_source.html
+++ b/docs/da/d7a/fixed__key__encryption__flags_8h_source.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d85/classshaka_1_1media_1_1mp2t_1_1TsSegmenter-members.html b/docs/da/d85/classshaka_1_1media_1_1mp2t_1_1TsSegmenter-members.html
index ed4f31e557..12cbec9557 100644
--- a/docs/da/d85/classshaka_1_1media_1_1mp2t_1_1TsSegmenter-members.html
+++ b/docs/da/d85/classshaka_1_1media_1_1mp2t_1_1TsSegmenter-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d88/mp4__muxer_8cc_source.html b/docs/da/d88/mp4__muxer_8cc_source.html
index c9db36c45b..9c52e5725b 100644
--- a/docs/da/d88/mp4__muxer_8cc_source.html
+++ b/docs/da/d88/mp4__muxer_8cc_source.html
@@ -503,7 +503,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d8b/classshaka_1_1media_1_1WebMMediaParser-members.html b/docs/da/d8b/classshaka_1_1media_1_1WebMMediaParser-members.html
index f3126f5b5a..62038e4f9c 100644
--- a/docs/da/d8b/classshaka_1_1media_1_1WebMMediaParser-members.html
+++ b/docs/da/d8b/classshaka_1_1media_1_1WebMMediaParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d8e/container__names_8cc_source.html b/docs/da/d8e/container__names_8cc_source.html
index fa8565d04a..06524e3072 100644
--- a/docs/da/d8e/container__names_8cc_source.html
+++ b/docs/da/d8e/container__names_8cc_source.html
@@ -1863,7 +1863,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d9b/structshaka_1_1media_1_1mp4_1_1CompositionOffset-members.html b/docs/da/d9b/structshaka_1_1media_1_1mp4_1_1CompositionOffset-members.html
index fb8cddcddd..60bafe16e1 100644
--- a/docs/da/d9b/structshaka_1_1media_1_1mp4_1_1CompositionOffset-members.html
+++ b/docs/da/d9b/structshaka_1_1media_1_1mp4_1_1CompositionOffset-members.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d9d/structshaka_1_1media_1_1mp4_1_1EC3Specific-members.html b/docs/da/d9d/structshaka_1_1media_1_1mp4_1_1EC3Specific-members.html
index 2b0f7b4c34..e370590b98 100644
--- a/docs/da/d9d/structshaka_1_1media_1_1mp4_1_1EC3Specific-members.html
+++ b/docs/da/d9d/structshaka_1_1media_1_1mp4_1_1EC3Specific-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d9f/classshaka_1_1MpdNotifierFactory-members.html b/docs/da/d9f/classshaka_1_1MpdNotifierFactory-members.html
index 4cacd305b5..6e15fcfd8c 100644
--- a/docs/da/d9f/classshaka_1_1MpdNotifierFactory-members.html
+++ b/docs/da/d9f/classshaka_1_1MpdNotifierFactory-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/d9f/classshaka_1_1media_1_1MockMuxerListener-members.html b/docs/da/d9f/classshaka_1_1media_1_1MockMuxerListener-members.html
index 339445b863..3f7abe3e23 100644
--- a/docs/da/d9f/classshaka_1_1media_1_1MockMuxerListener-members.html
+++ b/docs/da/d9f/classshaka_1_1media_1_1MockMuxerListener-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/da1/classshaka_1_1media_1_1mp2t_1_1TsPacket.html b/docs/da/da1/classshaka_1_1media_1_1mp2t_1_1TsPacket.html
index ecfea2f772..25806da0c5 100644
--- a/docs/da/da1/classshaka_1_1media_1_1mp2t_1_1TsPacket.html
+++ b/docs/da/da1/classshaka_1_1media_1_1mp2t_1_1TsPacket.html
@@ -145,7 +145,7 @@ static const int&#160;</td><td class="memItemRight" valign="bottom"><b>kPacketSi
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/db2/classshaka_1_1Representation-members.html b/docs/da/db2/classshaka_1_1Representation-members.html
index 2d1e62d80e..e2eaf9a088 100644
--- a/docs/da/db2/classshaka_1_1Representation-members.html
+++ b/docs/da/db2/classshaka_1_1Representation-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dbb/structshaka_1_1media_1_1mp4_1_1HandlerReference.html b/docs/da/dbb/structshaka_1_1media_1_1mp4_1_1HandlerReference.html
index 5eed1aba4b..9707f8ff6c 100644
--- a/docs/da/dbb/structshaka_1_1media_1_1mp4_1_1HandlerReference.html
+++ b/docs/da/dbb/structshaka_1_1media_1_1mp4_1_1HandlerReference.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dc3/status_8cc_source.html b/docs/da/dc3/status_8cc_source.html
index a05398adfa..9105a34136 100644
--- a/docs/da/dc3/status_8cc_source.html
+++ b/docs/da/dc3/status_8cc_source.html
@@ -168,7 +168,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dc4/structshaka_1_1media_1_1mp4_1_1TrackHeader.html b/docs/da/dc4/structshaka_1_1media_1_1mp4_1_1TrackHeader.html
index cd6ceabcf2..c14e022acc 100644
--- a/docs/da/dc4/structshaka_1_1media_1_1mp4_1_1TrackHeader.html
+++ b/docs/da/dc4/structshaka_1_1media_1_1mp4_1_1TrackHeader.html
@@ -215,7 +215,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dcb/es__descriptor_8h_source.html b/docs/da/dcb/es__descriptor_8h_source.html
index 0abe3f2436..1f94454305 100644
--- a/docs/da/dcb/es__descriptor_8h_source.html
+++ b/docs/da/dcb/es__descriptor_8h_source.html
@@ -183,7 +183,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd0/structshaka_1_1media_1_1mp4_1_1Edit.html b/docs/da/dd0/structshaka_1_1media_1_1mp4_1_1Edit.html
index a98105c100..64c95c6e1b 100644
--- a/docs/da/dd0/structshaka_1_1media_1_1mp4_1_1Edit.html
+++ b/docs/da/dd0/structshaka_1_1media_1_1mp4_1_1Edit.html
@@ -173,7 +173,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd0/webm__info__parser_8h_source.html b/docs/da/dd0/webm__info__parser_8h_source.html
index 55e33f1ee5..2b68cfb240 100644
--- a/docs/da/dd0/webm__info__parser_8h_source.html
+++ b/docs/da/dd0/webm__info__parser_8h_source.html
@@ -138,7 +138,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd1/fragmenter_8h_source.html b/docs/da/dd1/fragmenter_8h_source.html
index 559d3df492..424f39e622 100644
--- a/docs/da/dd1/fragmenter_8h_source.html
+++ b/docs/da/dd1/fragmenter_8h_source.html
@@ -205,7 +205,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd2/classshaka_1_1media_1_1mp2t_1_1TsPacket-members.html b/docs/da/dd2/classshaka_1_1media_1_1mp2t_1_1TsPacket-members.html
index 1fa4357905..9916b01724 100644
--- a/docs/da/dd2/classshaka_1_1media_1_1mp2t_1_1TsPacket-members.html
+++ b/docs/da/dd2/classshaka_1_1media_1_1mp2t_1_1TsPacket-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd6/classshaka_1_1media_1_1H264ByteToUnitStreamConverter-members.html b/docs/da/dd6/classshaka_1_1media_1_1H264ByteToUnitStreamConverter-members.html
index 7c74129162..17a1298679 100644
--- a/docs/da/dd6/classshaka_1_1media_1_1H264ByteToUnitStreamConverter-members.html
+++ b/docs/da/dd6/classshaka_1_1media_1_1H264ByteToUnitStreamConverter-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dd8/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser-members.html b/docs/da/dd8/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser-members.html
index 9597bf30b6..a2f6ae44fc 100644
--- a/docs/da/dd8/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser-members.html
+++ b/docs/da/dd8/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/dda/structshaka_1_1media_1_1H264SEIRecoveryPoint-members.html b/docs/da/dda/structshaka_1_1media_1_1H264SEIRecoveryPoint-members.html
index 4fc7fbf262..51bf2bcc73 100644
--- a/docs/da/dda/structshaka_1_1media_1_1H264SEIRecoveryPoint-members.html
+++ b/docs/da/dda/structshaka_1_1media_1_1H264SEIRecoveryPoint-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html b/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html
index ad311f7839..111af25c22 100644
--- a/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html
+++ b/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html
@@ -195,7 +195,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00137">137</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00134">134</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -232,7 +232,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00176">176</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00172">172</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -268,7 +268,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a42df88c1cdb415e7844eea18222692bb">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00203">203</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00199">199</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -304,7 +304,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#ad1c8f986a88647813f0e43a9b80d057e">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00224">224</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00220">220</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -341,7 +341,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>OK on success, an error status otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00165">165</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00161">161</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -395,7 +395,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00259">259</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00252">252</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -442,7 +442,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00233">233</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00229">229</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -489,7 +489,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 <p>Implements <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#ae33f2cdbd045572095acd7b8d6c1a789">shaka::media::KeySource</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00243">243</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00239">239</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -514,7 +514,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00285">285</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00278">278</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -539,7 +539,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00281">281</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html#l00274">274</a> of file <a class="el" href="../../d5/d89/widevine__key__source_8cc_source.html">widevine_key_source.cc</a>.</p>
 
 </div>
 </div>
@@ -550,7 +550,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/ddf/structshaka_1_1media_1_1mp4_1_1SampleDescription-members.html b/docs/da/ddf/structshaka_1_1media_1_1mp4_1_1SampleDescription-members.html
index 87f9a433e1..63fe0a27a0 100644
--- a/docs/da/ddf/structshaka_1_1media_1_1mp4_1_1SampleDescription-members.html
+++ b/docs/da/ddf/structshaka_1_1media_1_1mp4_1_1SampleDescription-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/de2/mock__mpd__builder_8cc_source.html b/docs/da/de2/mock__mpd__builder_8cc_source.html
index ae5570749b..f6020fcba8 100644
--- a/docs/da/de2/mock__mpd__builder_8cc_source.html
+++ b/docs/da/de2/mock__mpd__builder_8cc_source.html
@@ -123,7 +123,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/de4/classshaka_1_1media_1_1WebMClusterParser.html b/docs/da/de4/classshaka_1_1media_1_1WebMClusterParser.html
index d972fe299f..bd436c37ed 100644
--- a/docs/da/de4/classshaka_1_1media_1_1WebMClusterParser.html
+++ b/docs/da/de4/classshaka_1_1media_1_1WebMClusterParser.html
@@ -365,7 +365,7 @@ The number of bytes parsed on success. </dd></dl>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/de6/structshaka_1_1media_1_1mp4_1_1SchemeType-members.html b/docs/da/de6/structshaka_1_1media_1_1mp4_1_1SchemeType-members.html
index 2e146cb653..e4adfc9967 100644
--- a/docs/da/de6/structshaka_1_1media_1_1mp4_1_1SchemeType-members.html
+++ b/docs/da/de6/structshaka_1_1media_1_1mp4_1_1SchemeType-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/de8/classshaka_1_1media_1_1AudioStreamInfo-members.html b/docs/da/de8/classshaka_1_1media_1_1AudioStreamInfo-members.html
index 33157d45d4..3be3eec80f 100644
--- a/docs/da/de8/classshaka_1_1media_1_1AudioStreamInfo-members.html
+++ b/docs/da/de8/classshaka_1_1media_1_1AudioStreamInfo-members.html
@@ -126,7 +126,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/de9/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo.html b/docs/da/de9/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo.html
index 11559b311c..0ecdbdef0c 100644
--- a/docs/da/de9/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo.html
+++ b/docs/da/de9/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo.html
@@ -179,7 +179,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html b/docs/da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html
index a36958ca24..8f2cb8eed3 100644
--- a/docs/da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html
+++ b/docs/da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html
@@ -152,7 +152,7 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href=".
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/df4/aes__decryptor_8cc_source.html b/docs/da/df4/aes__decryptor_8cc_source.html
index c434512e24..5fc9d73711 100644
--- a/docs/da/df4/aes__decryptor_8cc_source.html
+++ b/docs/da/df4/aes__decryptor_8cc_source.html
@@ -254,11 +254,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1AesCbcDecryptor_html_a855ab9fa2f350879a7716ec90033f825"><div class="ttname"><a href="../../df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html#a855ab9fa2f350879a7716ec90033f825">shaka::media::AesCbcDecryptor::AesCbcDecryptor</a></div><div class="ttdeci">AesCbcDecryptor(CbcPaddingScheme padding_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../da/df4/aes__decryptor_8cc_source.html#l00025">aes_decryptor.cc:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCbcDecryptor_html_a71ff0b9654de96f9990b29c35fa9b7bf"><div class="ttname"><a href="../../df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html#a71ff0b9654de96f9990b29c35fa9b7bf">shaka::media::AesCbcDecryptor::InitializeWithIv</a></div><div class="ttdeci">bool InitializeWithIv(const std::vector&lt; uint8_t &gt; &amp;key, const std::vector&lt; uint8_t &gt; &amp;iv) override</div><div class="ttdef"><b>Definition:</b> <a href="../../da/df4/aes__decryptor_8cc_source.html#l00040">aes_decryptor.cc:40</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">aes_cryptor.cc:69</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">aes_cryptor.cc:67</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/df5/structshaka_1_1media_1_1mp4_1_1SampleDescription.html b/docs/da/df5/structshaka_1_1media_1_1mp4_1_1SampleDescription.html
index af4d4cbabe..e1ae679fde 100644
--- a/docs/da/df5/structshaka_1_1media_1_1mp4_1_1SampleDescription.html
+++ b/docs/da/df5/structshaka_1_1media_1_1mp4_1_1SampleDescription.html
@@ -191,7 +191,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html b/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html
index 34deedb375..785f0063b0 100644
--- a/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html
+++ b/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d05/structshaka_1_1media_1_1H265SliceHeader.html b/docs/db/d05/structshaka_1_1media_1_1H265SliceHeader.html
index 9bd9033112..9c8ea26eb0 100644
--- a/docs/db/d05/structshaka_1_1media_1_1H265SliceHeader.html
+++ b/docs/db/d05/structshaka_1_1media_1_1H265SliceHeader.html
@@ -236,7 +236,7 @@ std::vector&lt; int &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>e
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d11/structshaka_1_1media_1_1mp4_1_1CodecConfiguration.html b/docs/db/d11/structshaka_1_1media_1_1mp4_1_1CodecConfiguration.html
index e5577e72ff..3f937b018b 100644
--- a/docs/db/d11/structshaka_1_1media_1_1mp4_1_1CodecConfiguration.html
+++ b/docs/db/d11/structshaka_1_1media_1_1mp4_1_1CodecConfiguration.html
@@ -176,7 +176,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d14/classshaka_1_1media_1_1H265Parser-members.html b/docs/db/d14/classshaka_1_1media_1_1H265Parser-members.html
index 6b0a8d9ff4..252fde1ee0 100644
--- a/docs/db/d14/classshaka_1_1media_1_1H265Parser-members.html
+++ b/docs/db/d14/classshaka_1_1media_1_1H265Parser-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d14/structshaka_1_1media_1_1H264WeightingFactors-members.html b/docs/db/d14/structshaka_1_1media_1_1H264WeightingFactors-members.html
index ffd2722700..a33c7c1733 100644
--- a/docs/db/d14/structshaka_1_1media_1_1H264WeightingFactors-members.html
+++ b/docs/db/d14/structshaka_1_1media_1_1H264WeightingFactors-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d21/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader.html b/docs/db/d21/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader.html
index e5b5385694..dd8dc50476 100644
--- a/docs/db/d21/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader.html
+++ b/docs/db/d21/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader.html
@@ -175,7 +175,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>flags</b></td></t
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html b/docs/db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html
index 54a960a727..4acf3d1c89 100644
--- a/docs/db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html
+++ b/docs/db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html
@@ -179,7 +179,7 @@ FourCC&#160;</td><td class="memItemRight" valign="bottom"><b>protection_scheme</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d31/h26x__byte__to__unit__stream__converter_8h_source.html b/docs/db/d31/h26x__byte__to__unit__stream__converter_8h_source.html
index f9666b9831..0017c43f3c 100644
--- a/docs/db/d31/h26x__byte__to__unit__stream__converter_8h_source.html
+++ b/docs/db/d31/h26x__byte__to__unit__stream__converter_8h_source.html
@@ -143,7 +143,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d31/track__run__iterator_8cc_source.html b/docs/db/d31/track__run__iterator_8cc_source.html
index f508bd4ee6..678db9b9b6 100644
--- a/docs/db/d31/track__run__iterator_8cc_source.html
+++ b/docs/db/d31/track__run__iterator_8cc_source.html
@@ -767,7 +767,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d38/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator-members.html b/docs/db/d38/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator-members.html
index facc9cc02c..7f61315f5f 100644
--- a/docs/db/d38/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator-members.html
+++ b/docs/db/d38/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d3b/classshaka_1_1media_1_1VideoSliceHeaderParser-members.html b/docs/db/d3b/classshaka_1_1media_1_1VideoSliceHeaderParser-members.html
index b178c23d99..12a9e00ffa 100644
--- a/docs/db/d3b/classshaka_1_1media_1_1VideoSliceHeaderParser-members.html
+++ b/docs/db/d3b/classshaka_1_1media_1_1VideoSliceHeaderParser-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d45/mpd__notify__muxer__listener_8h_source.html b/docs/db/d45/mpd__notify__muxer__listener_8h_source.html
index bad0e7ec69..48307c6a61 100644
--- a/docs/db/d45/mpd__notify__muxer__listener_8h_source.html
+++ b/docs/db/d45/mpd__notify__muxer__listener_8h_source.html
@@ -189,7 +189,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d4b/classshaka_1_1MockAdaptationSet.html b/docs/db/d4b/classshaka_1_1MockAdaptationSet.html
index d5da5e9973..1208b632fd 100644
--- a/docs/db/d4b/classshaka_1_1MockAdaptationSet.html
+++ b/docs/db/d4b/classshaka_1_1MockAdaptationSet.html
@@ -183,7 +183,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html b/docs/db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html
index 8b4fca88b3..b7a6322785 100644
--- a/docs/db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html
+++ b/docs/db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html
@@ -225,7 +225,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d51/mp2t__media__parser_8h_source.html b/docs/db/d51/mp2t__media__parser_8h_source.html
index 1d15cdd6c6..e254ff0460 100644
--- a/docs/db/d51/mp2t__media__parser_8h_source.html
+++ b/docs/db/d51/mp2t__media__parser_8h_source.html
@@ -128,7 +128,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">Parse</a>(<span class="keyword">const</span> uint8_t* buf, <span class="keywordtype">int</span> size) <span class="keyword">override</span> WARN_UNUSED_RESULT;</div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, PidState*&gt; PidMap;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, std::unique_ptr&lt;PidState&gt;&gt; PidMap;</div>
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
 <div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="comment">// Callback invoked to register a Program Map Table.</span></div>
 <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="comment">// Note: Does nothing if the PID is already registered.</span></div>
@@ -182,17 +182,17 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;<span class="preprocessor">#endif</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaParser_html"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">shaka::media::MediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d12/media__parser_8h_source.html#l00025">media_parser.h:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaParser_html_a95d25a50ad371304f1abce9971ce3704"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">shaka::media::MediaParser::InitCB</a></div><div class="ttdeci">base::Callback&lt; void(const std::vector&lt; scoped_refptr&lt; StreamInfo &gt; &gt; &amp;stream_info)&gt; InitCB</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d12/media__parser_8h_source.html#l00034">media_parser.h:34</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_aa2aff12312827aacf2b7db6e2f792c52"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">shaka::media::mp2t::Mp2tMediaParser::Init</a></div><div class="ttdeci">void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00160">mp2t_media_parser.cc:160</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_aa2aff12312827aacf2b7db6e2f792c52"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">shaka::media::mp2t::Mp2tMediaParser::Init</a></div><div class="ttdeci">void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00157">mp2t_media_parser.cc:157</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">shaka::media::mp2t::Mp2tMediaParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d51/mp2t__media__parser_8h_source.html#l00030">mp2t_media_parser.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_afdb1a88116e3347e67afeb7715847135"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">shaka::media::mp2t::Mp2tMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00173">mp2t_media_parser.cc:173</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_afdb1a88116e3347e67afeb7715847135"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">shaka::media::mp2t::Mp2tMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00170">mp2t_media_parser.cc:170</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaParser_html_a0ac13291317f7d3d9175c4e91e57b891"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">shaka::media::MediaParser::NewSampleCB</a></div><div class="ttdeci">base::Callback&lt; bool(uint32_t track_id, const scoped_refptr&lt; MediaSample &gt; &amp;media_sample)&gt; NewSampleCB</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d12/media__parser_8h_source.html#l00043">media_parser.h:43</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">shaka::media::ByteQueue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dc6/byte__queue_8h_source.html#l00022">byte_queue.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_af1a8a33b4ce61777c876717b005d0026"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">shaka::media::mp2t::Mp2tMediaParser::Parse</a></div><div class="ttdeci">bool Parse(const uint8_t *buf, int size) override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00192">mp2t_media_parser.cc:192</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser_html_af1a8a33b4ce61777c876717b005d0026"><div class="ttname"><a href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">shaka::media::mp2t::Mp2tMediaParser::Parse</a></div><div class="ttdeci">bool Parse(const uint8_t *buf, int size) override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d74/mp2t__media__parser_8cc_source.html#l00188">mp2t_media_parser.cc:188</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d51/two__pass__single__segment__segmenter_8h_source.html b/docs/db/d51/two__pass__single__segment__segmenter_8h_source.html
index e9c1292712..58178b5bfc 100644
--- a/docs/db/d51/two__pass__single__segment__segmenter_8h_source.html
+++ b/docs/db/d51/two__pass__single__segment__segmenter_8h_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d5a/classshaka_1_1media_1_1VP9Parser.html b/docs/db/d5a/classshaka_1_1media_1_1VP9Parser.html
index 5d0edf78fc..2c5601ff89 100644
--- a/docs/db/d5a/classshaka_1_1media_1_1VP9Parser.html
+++ b/docs/db/d5a/classshaka_1_1media_1_1VP9Parser.html
@@ -238,7 +238,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d60/mpd__options_8h_source.html b/docs/db/d60/mpd__options_8h_source.html
index 5814bd4cb3..b399111c4e 100644
--- a/docs/db/d60/mpd__options_8h_source.html
+++ b/docs/db/d60/mpd__options_8h_source.html
@@ -126,7 +126,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d64/webvtt__media__parser_8h_source.html b/docs/db/d64/webvtt__media__parser_8h_source.html
index 9bf156f9f5..c57d6dde97 100644
--- a/docs/db/d64/webvtt__media__parser_8h_source.html
+++ b/docs/db/d64/webvtt__media__parser_8h_source.html
@@ -181,7 +181,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d66/structshaka_1_1media_1_1mp4_1_1SegmentType-members.html b/docs/db/d66/structshaka_1_1media_1_1mp4_1_1SegmentType-members.html
index 878a710343..52efa5b23c 100644
--- a/docs/db/d66/structshaka_1_1media_1_1mp4_1_1SegmentType-members.html
+++ b/docs/db/d66/structshaka_1_1media_1_1mp4_1_1SegmentType-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d71/http__key__fetcher_8h_source.html b/docs/db/d71/http__key__fetcher_8h_source.html
index 39d8135624..894d3e0c5c 100644
--- a/docs/db/d71/http__key__fetcher_8h_source.html
+++ b/docs/db/d71/http__key__fetcher_8h_source.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d74/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord-members.html b/docs/db/d74/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord-members.html
index df3102601d..170d7e74f9 100644
--- a/docs/db/d74/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord-members.html
+++ b/docs/db/d74/classshaka_1_1media_1_1HEVCDecoderConfigurationRecord-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d75/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter-members.html b/docs/db/d75/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter-members.html
index 938cfe9ffe..4f4b161ecb 100644
--- a/docs/db/d75/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter-members.html
+++ b/docs/db/d75/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter-members.html
@@ -130,7 +130,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d78/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter-members.html b/docs/db/d78/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter-members.html
index 6268ee8d79..9719111949 100644
--- a/docs/db/d78/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter-members.html
+++ b/docs/db/d78/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d7e/muxer__options_8cc_source.html b/docs/db/d7e/muxer__options_8cc_source.html
index 69fc45b64f..d427d2c945 100644
--- a/docs/db/d7e/muxer__options_8cc_source.html
+++ b/docs/db/d7e/muxer__options_8cc_source.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d84/classshaka_1_1media_1_1AACAudioSpecificConfig-members.html b/docs/db/d84/classshaka_1_1media_1_1AACAudioSpecificConfig-members.html
index 93a2c6814b..7292a96446 100644
--- a/docs/db/d84/classshaka_1_1media_1_1AACAudioSpecificConfig-members.html
+++ b/docs/db/d84/classshaka_1_1media_1_1AACAudioSpecificConfig-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d86/classshaka_1_1media_1_1NaluReader.html b/docs/db/d86/classshaka_1_1media_1_1NaluReader.html
index 8fdd30173b..766c11ac56 100644
--- a/docs/db/d86/classshaka_1_1media_1_1NaluReader.html
+++ b/docs/db/d86/classshaka_1_1media_1_1NaluReader.html
@@ -228,7 +228,7 @@ static bool&#160;</td><td class="memItemRight" valign="bottom"><b>FindStartCode<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d8f/mp4__muxer_8h_source.html b/docs/db/d8f/mp4__muxer_8h_source.html
index 958072ac9c..2a28a4206b 100644
--- a/docs/db/d8f/mp4__muxer_8h_source.html
+++ b/docs/db/d8f/mp4__muxer_8h_source.html
@@ -173,7 +173,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html b/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html
index f880be43e2..20678035d9 100644
--- a/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html
+++ b/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html
@@ -125,7 +125,7 @@ std::unique_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Clus
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html b/docs/db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html
index bd66080870..c7d91808ac 100644
--- a/docs/db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html
+++ b/docs/db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html
@@ -339,7 +339,7 @@ template&lt;typename T &gt; </div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d95/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset.html b/docs/db/d95/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset.html
index 2125073c07..384a9f8064 100644
--- a/docs/db/d95/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset.html
+++ b/docs/db/d95/structshaka_1_1media_1_1mp4_1_1ChunkLargeOffset.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/d96/wvm__media__parser_8h_source.html b/docs/db/d96/wvm__media__parser_8h_source.html
index 2e936b43d1..06d5fecc65 100644
--- a/docs/db/d96/wvm__media__parser_8h_source.html
+++ b/docs/db/d96/wvm__media__parser_8h_source.html
@@ -362,7 +362,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/da4/classBandwidthEstimator-members.html b/docs/db/da4/classBandwidthEstimator-members.html
index 5d7a6eca56..05ca15d231 100644
--- a/docs/db/da4/classBandwidthEstimator-members.html
+++ b/docs/db/da4/classBandwidthEstimator-members.html
@@ -97,7 +97,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/da6/memory__file_8h_source.html b/docs/db/da6/memory__file_8h_source.html
index 91476fe987..3ad7535c7b 100644
--- a/docs/db/da6/memory__file_8h_source.html
+++ b/docs/db/da6/memory__file_8h_source.html
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dab/classshaka_1_1media_1_1TextStreamInfo.html b/docs/db/dab/classshaka_1_1media_1_1TextStreamInfo.html
index 89358ae63c..76317c8a70 100644
--- a/docs/db/dab/classshaka_1_1media_1_1TextStreamInfo.html
+++ b/docs/db/dab/classshaka_1_1media_1_1TextStreamInfo.html
@@ -282,7 +282,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_language</b> (con
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dae/classshaka_1_1media_1_1WebMInfoParser.html b/docs/db/dae/classshaka_1_1media_1_1WebMInfoParser.html
index 79c82ce4fc..3cfcf5287f 100644
--- a/docs/db/dae/classshaka_1_1media_1_1WebMInfoParser.html
+++ b/docs/db/dae/classshaka_1_1media_1_1WebMInfoParser.html
@@ -175,7 +175,7 @@ The number of bytes parsed on success. </dd></dl>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dae/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader-members.html b/docs/db/dae/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader-members.html
index e09a57b7a5..d654f90484 100644
--- a/docs/db/dae/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader-members.html
+++ b/docs/db/dae/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/db1/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry-members.html b/docs/db/db1/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry-members.html
index 174e72ab52..780d2b876e 100644
--- a/docs/db/db1/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry-members.html
+++ b/docs/db/db1/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/db8/structshaka_1_1media_1_1OnMediaEndParameters.html b/docs/db/db8/structshaka_1_1media_1_1OnMediaEndParameters.html
index 23774b1820..b0e5541dfa 100644
--- a/docs/db/db8/structshaka_1_1media_1_1OnMediaEndParameters.html
+++ b/docs/db/db8/structshaka_1_1media_1_1OnMediaEndParameters.html
@@ -130,7 +130,7 @@ uint64_t&#160;</td><td class="memItemRight" valign="bottom"><b>file_size</b></td
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/db8/structshaka_1_1media_1_1mp4_1_1TrackEncryption.html b/docs/db/db8/structshaka_1_1media_1_1mp4_1_1TrackEncryption.html
index 65de90bfd3..cb14c9df6f 100644
--- a/docs/db/db8/structshaka_1_1media_1_1mp4_1_1TrackEncryption.html
+++ b/docs/db/db8/structshaka_1_1media_1_1mp4_1_1TrackEncryption.html
@@ -197,7 +197,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dcb/classshaka_1_1media_1_1VPxParser.html b/docs/db/dcb/classshaka_1_1media_1_1VPxParser.html
index aefdfb2cc6..b05194b97f 100644
--- a/docs/db/dcb/classshaka_1_1media_1_1VPxParser.html
+++ b/docs/db/dcb/classshaka_1_1media_1_1VPxParser.html
@@ -205,7 +205,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dcc/classshaka_1_1media_1_1webm_1_1Encryptor-members.html b/docs/db/dcc/classshaka_1_1media_1_1webm_1_1Encryptor-members.html
index 0db7480f17..ad21769754 100644
--- a/docs/db/dcc/classshaka_1_1media_1_1webm_1_1Encryptor-members.html
+++ b/docs/db/dcc/classshaka_1_1media_1_1webm_1_1Encryptor-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dcd/classshaka_1_1MpdWriter.html b/docs/db/dcd/classshaka_1_1MpdWriter.html
index 7e906c0cba..da82731aa8 100644
--- a/docs/db/dcd/classshaka_1_1MpdWriter.html
+++ b/docs/db/dcd/classshaka_1_1MpdWriter.html
@@ -123,7 +123,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MpdWriterTest</b></t
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dcd/structshaka_1_1media_1_1mp4_1_1DTSSpecific-members.html b/docs/db/dcd/structshaka_1_1media_1_1mp4_1_1DTSSpecific-members.html
index 0b35b6057f..a868128cea 100644
--- a/docs/db/dcd/structshaka_1_1media_1_1mp4_1_1DTSSpecific-members.html
+++ b/docs/db/dcd/structshaka_1_1media_1_1mp4_1_1DTSSpecific-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html b/docs/db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html
index 25c5a1a36d..1b9456620a 100644
--- a/docs/db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html
+++ b/docs/db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html
@@ -531,7 +531,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dd2/chunk__info__iterator_8h_source.html b/docs/db/dd2/chunk__info__iterator_8h_source.html
index a091501560..e43688a6c6 100644
--- a/docs/db/dd2/chunk__info__iterator_8h_source.html
+++ b/docs/db/dd2/chunk__info__iterator_8h_source.html
@@ -161,7 +161,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dd9/sync__sample__iterator_8h_source.html b/docs/db/dd9/sync__sample__iterator_8h_source.html
index 1d5fcb2921..7a4c844824 100644
--- a/docs/db/dd9/sync__sample__iterator_8h_source.html
+++ b/docs/db/dd9/sync__sample__iterator_8h_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dde/h265__parser_8cc_source.html b/docs/db/dde/h265__parser_8cc_source.html
index d7d0562552..bb933ce637 100644
--- a/docs/db/dde/h265__parser_8cc_source.html
+++ b/docs/db/dde/h265__parser_8cc_source.html
@@ -99,1129 +99,1123 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;algorithm&gt;</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/macros.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#define TRUE_OR_RETURN(a)                            \</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">  do {                                               \</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">    if (!(a)) {                                      \</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Failure while processing &quot; &lt;&lt; #a; \</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">      return kInvalidStream;                         \</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">    }                                                \</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#define OK_OR_RETURN(a)  \</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">  do {                   \</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">    Result status = (a); \</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">    if (status != kOk)   \</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">      return status;     \</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">  } while (false)</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="keywordtype">int</span> GetNumPicTotalCurr(<span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;                       <span class="keyword">const</span> H265Sps&amp; sps) {</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">int</span> num_pic_total_curr = 0;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keyword">const</span> H265ReferencePictureSet&amp; ref_pic_set =</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      slice_header.short_term_ref_pic_set_sps_flag</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;          ? sps.st_ref_pic_sets[slice_header.short_term_ref_pic_set_idx]</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;          : slice_header.st_ref_pic_set;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ref_pic_set.num_negative_pics; i++) {</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keywordflow">if</span> (ref_pic_set.used_by_curr_pic_s0[i])</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;      num_pic_total_curr++;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  }</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ref_pic_set.num_positive_pics; i++) {</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keywordflow">if</span> (ref_pic_set.used_by_curr_pic_s1[i])</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;      num_pic_total_curr++;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  }</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">return</span> num_pic_total_curr + slice_header.used_by_curr_pic_lt;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="keywordtype">void</span> GetAspectRatioInfo(<span class="keyword">const</span> H265Sps&amp; sps,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                        uint32_t* pixel_width,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;                        uint32_t* pixel_height) {</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="comment">// The default value is 0; so if this is not in the SPS, it will correctly</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="comment">// assume unspecified.</span></div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">int</span> aspect_ratio_idc = sps.vui_parameters.aspect_ratio_idc;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="comment">// Table E.1</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordflow">switch</span> (aspect_ratio_idc) {</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keywordflow">case</span> 1:  *pixel_width = 1;   *pixel_height = 1;  <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keywordflow">case</span> 2:  *pixel_width = 12;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">case</span> 3:  *pixel_width = 10;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="keywordflow">case</span> 4:  *pixel_width = 16;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">case</span> 5:  *pixel_width = 40;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">case</span> 6:  *pixel_width = 24;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="keywordflow">case</span> 7:  *pixel_width = 20;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">case</span> 8:  *pixel_width = 32;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">case</span> 9:  *pixel_width = 80;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    <span class="keywordflow">case</span> 10: *pixel_width = 18;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="keywordflow">case</span> 11: *pixel_width = 15;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="keywordflow">case</span> 12: *pixel_width = 64;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keywordflow">case</span> 13: *pixel_width = 160; *pixel_height = 99; <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">case</span> 14: *pixel_width = 4;   *pixel_height = 3;  <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">case</span> 15: *pixel_width = 3;   *pixel_height = 2;  <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordflow">case</span> 16: *pixel_width = 2;   *pixel_height = 1;  <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordflow">case</span> 255:</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;      *pixel_width = sps.vui_parameters.sar_width;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      *pixel_height = sps.vui_parameters.sar_height;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      <span class="comment">// Section E.3.1 specifies that other values should be interpreted as 0.</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Unknown aspect_ratio_idc &quot;</span> &lt;&lt; aspect_ratio_idc;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      FALLTHROUGH_INTENDED;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="keywordflow">case</span> 0:</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;      <span class="comment">// Unlike the spec, assume 1:1 if not specified.</span></div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      *pixel_width = 1;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      *pixel_height = 1;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  }</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;}</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H265Sps&amp; sps,</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;                              uint32_t* coded_width,</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                              uint32_t* coded_height,</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;                              uint32_t* pixel_width,</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;                              uint32_t* pixel_height) {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordtype">int</span> crop_x = 0;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">int</span> crop_y = 0;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordflow">if</span> (sps.conformance_window_flag) {</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keywordtype">int</span> sub_width_c = 0;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keywordtype">int</span> sub_height_c = 0;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="comment">// Table 6-1</span></div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    <span class="keywordflow">switch</span> (sps.chroma_format_idc) {</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;      <span class="keywordflow">case</span> 0:  <span class="comment">// Monochrome</span></div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        sub_width_c = 1;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;      <span class="keywordflow">case</span> 1:  <span class="comment">// 4:2:0</span></div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        sub_width_c = 2;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;        sub_height_c = 2;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;      <span class="keywordflow">case</span> 2:  <span class="comment">// 4:2:2</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;        sub_width_c = 2;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;      <span class="keywordflow">case</span> 3:  <span class="comment">// 4:4:4</span></div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        sub_width_c = 1;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;      <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected chroma_format_idc &quot;</span> &lt;&lt; sps.chroma_format_idc;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    }</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="comment">// Formula D-28, D-29</span></div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    crop_x =</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;        sub_width_c * (sps.conf_win_right_offset + sps.conf_win_left_offset);</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    crop_y =</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;        sub_height_c * (sps.conf_win_bottom_offset + sps.conf_win_top_offset);</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  }</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="comment">// Formula D-28, D-29</span></div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  *coded_width = sps.pic_width_in_luma_samples - crop_x;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  *coded_height = sps.pic_height_in_luma_samples - crop_y;</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  GetAspectRatioInfo(sps, pixel_width, pixel_height);</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;}</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;H265Pps::H265Pps() {}</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;H265Pps::~H265Pps() {}</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;H265Sps::H265Sps() {}</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;H265Sps::~H265Sps() {}</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;<span class="keywordtype">int</span> H265Sps::GetPicSizeInCtbsY()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordtype">int</span> min_cb_log2_size_y = log2_min_luma_coding_block_size_minus3 + 3;</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  <span class="keywordtype">int</span> ctb_log2_size_y =</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;      min_cb_log2_size_y + log2_diff_max_min_luma_coding_block_size;</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  <span class="keywordtype">int</span> ctb_size_y = 1 &lt;&lt; ctb_log2_size_y;</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="comment">// Round-up division.</span></div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordtype">int</span> pic_width_in_ctbs_y = (pic_width_in_luma_samples - 1) / ctb_size_y + 1;</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keywordtype">int</span> pic_height_in_ctbs_y = (pic_height_in_luma_samples - 1) / ctb_size_y + 1;</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keywordflow">return</span> pic_width_in_ctbs_y * pic_height_in_ctbs_y;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;}</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;<span class="keywordtype">int</span> H265Sps::GetChromaArrayType()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordflow">if</span> (!separate_colour_plane_flag)</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    <span class="keywordflow">return</span> chroma_format_idc;</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keywordflow">else</span></div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <span class="keywordflow">return</span> 0;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;}</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;H265ReferencePictureListModifications::H265ReferencePictureListModifications() {</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;}</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;H265ReferencePictureListModifications::</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    ~H265ReferencePictureListModifications() {}</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;H265SliceHeader::H265SliceHeader() {}</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;H265SliceHeader::~H265SliceHeader() {}</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;H265Parser::H265Parser() {}</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;H265Parser::~H265Parser() {</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  STLDeleteValues(&amp;active_spses_);</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  STLDeleteValues(&amp;active_ppses_);</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;}</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
-<div class="line"><a name="l00187"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">  187</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">H265Parser::ParseSliceHeader</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu,</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;                                                <a class="code" href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">H265SliceHeader</a>* slice_header) {</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  DCHECK(nalu.is_video_slice());</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  *slice_header = <a class="code" href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">H265SliceHeader</a>();</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="comment">// Parses whole element.</span></div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;first_slice_segment_in_pic_flag));</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordflow">if</span> (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() &gt;= Nalu::H265_BLA_W_LP &amp;&amp;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;      nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() &lt;= Nalu::H265_RSV_IRAP_VCL23) {</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;no_output_of_prior_pics_flag));</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  }</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/macros.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/nalu_reader.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#define TRUE_OR_RETURN(a)                            \</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">  do {                                               \</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">    if (!(a)) {                                      \</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Failure while processing &quot; &lt;&lt; #a; \</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">      return kInvalidStream;                         \</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">    }                                                \</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#define OK_OR_RETURN(a)  \</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">  do {                   \</span></div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">    Result status = (a); \</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">    if (status != kOk)   \</span></div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">      return status;     \</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">  } while (false)</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keywordtype">int</span> GetNumPicTotalCurr(<span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;                       <span class="keyword">const</span> H265Sps&amp; sps) {</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">int</span> num_pic_total_curr = 0;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keyword">const</span> H265ReferencePictureSet&amp; ref_pic_set =</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      slice_header.short_term_ref_pic_set_sps_flag</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;          ? sps.st_ref_pic_sets[slice_header.short_term_ref_pic_set_idx]</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;          : slice_header.st_ref_pic_set;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ref_pic_set.num_negative_pics; i++) {</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordflow">if</span> (ref_pic_set.used_by_curr_pic_s0[i])</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;      num_pic_total_curr++;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  }</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ref_pic_set.num_positive_pics; i++) {</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <span class="keywordflow">if</span> (ref_pic_set.used_by_curr_pic_s1[i])</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;      num_pic_total_curr++;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  }</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordflow">return</span> num_pic_total_curr + slice_header.used_by_curr_pic_lt;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;}</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="keywordtype">void</span> GetAspectRatioInfo(<span class="keyword">const</span> H265Sps&amp; sps,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                        uint32_t* pixel_width,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                        uint32_t* pixel_height) {</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// The default value is 0; so if this is not in the SPS, it will correctly</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="comment">// assume unspecified.</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">int</span> aspect_ratio_idc = sps.vui_parameters.aspect_ratio_idc;</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="comment">// Table E.1</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordflow">switch</span> (aspect_ratio_idc) {</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keywordflow">case</span> 1:  *pixel_width = 1;   *pixel_height = 1;  <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keywordflow">case</span> 2:  *pixel_width = 12;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keywordflow">case</span> 3:  *pixel_width = 10;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">case</span> 4:  *pixel_width = 16;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="keywordflow">case</span> 5:  *pixel_width = 40;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">case</span> 6:  *pixel_width = 24;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">case</span> 7:  *pixel_width = 20;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="keywordflow">case</span> 8:  *pixel_width = 32;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">case</span> 9:  *pixel_width = 80;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">case</span> 10: *pixel_width = 18;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    <span class="keywordflow">case</span> 11: *pixel_width = 15;  *pixel_height = 11; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="keywordflow">case</span> 12: *pixel_width = 64;  *pixel_height = 33; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="keywordflow">case</span> 13: *pixel_width = 160; *pixel_height = 99; <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keywordflow">case</span> 14: *pixel_width = 4;   *pixel_height = 3;  <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">case</span> 15: *pixel_width = 3;   *pixel_height = 2;  <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">case</span> 16: *pixel_width = 2;   *pixel_height = 1;  <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keywordflow">case</span> 255:</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      *pixel_width = sps.vui_parameters.sar_width;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;      *pixel_height = sps.vui_parameters.sar_height;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      <span class="comment">// Section E.3.1 specifies that other values should be interpreted as 0.</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Unknown aspect_ratio_idc &quot;</span> &lt;&lt; aspect_ratio_idc;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      FALLTHROUGH_INTENDED;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">case</span> 0:</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      <span class="comment">// Unlike the spec, assume 1:1 if not specified.</span></div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;      *pixel_width = 1;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      *pixel_height = 1;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  }</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;}</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H265Sps&amp; sps,</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;                              uint32_t* coded_width,</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;                              uint32_t* coded_height,</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                              uint32_t* pixel_width,</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;                              uint32_t* pixel_height) {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">int</span> crop_x = 0;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordtype">int</span> crop_y = 0;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">if</span> (sps.conformance_window_flag) {</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keywordtype">int</span> sub_width_c = 0;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keywordtype">int</span> sub_height_c = 0;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="comment">// Table 6-1</span></div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">switch</span> (sps.chroma_format_idc) {</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      <span class="keywordflow">case</span> 0:  <span class="comment">// Monochrome</span></div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        sub_width_c = 1;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      <span class="keywordflow">case</span> 1:  <span class="comment">// 4:2:0</span></div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;        sub_width_c = 2;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        sub_height_c = 2;</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;      <span class="keywordflow">case</span> 2:  <span class="comment">// 4:2:2</span></div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;        sub_width_c = 2;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;      <span class="keywordflow">case</span> 3:  <span class="comment">// 4:4:4</span></div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;        sub_width_c = 1;</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;      <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected chroma_format_idc &quot;</span> &lt;&lt; sps.chroma_format_idc;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    }</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    <span class="comment">// Formula D-28, D-29</span></div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    crop_x =</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        sub_width_c * (sps.conf_win_right_offset + sps.conf_win_left_offset);</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    crop_y =</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;        sub_height_c * (sps.conf_win_bottom_offset + sps.conf_win_top_offset);</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  }</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="comment">// Formula D-28, D-29</span></div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  *coded_width = sps.pic_width_in_luma_samples - crop_x;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  *coded_height = sps.pic_height_in_luma_samples - crop_y;</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  GetAspectRatioInfo(sps, pixel_width, pixel_height);</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;}</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;H265Pps::H265Pps() {}</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;H265Pps::~H265Pps() {}</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;H265Sps::H265Sps() {}</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;H265Sps::~H265Sps() {}</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="keywordtype">int</span> H265Sps::GetPicSizeInCtbsY()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  <span class="keywordtype">int</span> min_cb_log2_size_y = log2_min_luma_coding_block_size_minus3 + 3;</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordtype">int</span> ctb_log2_size_y =</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;      min_cb_log2_size_y + log2_diff_max_min_luma_coding_block_size;</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  <span class="keywordtype">int</span> ctb_size_y = 1 &lt;&lt; ctb_log2_size_y;</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="comment">// Round-up division.</span></div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordtype">int</span> pic_width_in_ctbs_y = (pic_width_in_luma_samples - 1) / ctb_size_y + 1;</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordtype">int</span> pic_height_in_ctbs_y = (pic_height_in_luma_samples - 1) / ctb_size_y + 1;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keywordflow">return</span> pic_width_in_ctbs_y * pic_height_in_ctbs_y;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;}</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;<span class="keywordtype">int</span> H265Sps::GetChromaArrayType()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordflow">if</span> (!separate_colour_plane_flag)</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="keywordflow">return</span> chroma_format_idc;</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keywordflow">else</span></div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    <span class="keywordflow">return</span> 0;</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;}</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;H265ReferencePictureListModifications::H265ReferencePictureListModifications() {</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;}</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;H265ReferencePictureListModifications::</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    ~H265ReferencePictureListModifications() {}</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;H265SliceHeader::H265SliceHeader() {}</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;H265SliceHeader::~H265SliceHeader() {}</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;H265Parser::H265Parser() {}</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;H265Parser::~H265Parser() {}</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;</div>
+<div class="line"><a name="l00183"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">  183</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">H265Parser::ParseSliceHeader</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu,</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;                                                <a class="code" href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">H265SliceHeader</a>* slice_header) {</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  DCHECK(nalu.is_video_slice());</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  *slice_header = <a class="code" href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">H265SliceHeader</a>();</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="comment">// Parses whole element.</span></div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;first_slice_segment_in_pic_flag));</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="keywordflow">if</span> (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() &gt;= Nalu::H265_BLA_W_LP &amp;&amp;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;      nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() &lt;= Nalu::H265_RSV_IRAP_VCL23) {</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;no_output_of_prior_pics_flag));</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  }</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;pic_parameter_set_id));</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>* pps = <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">GetPps</a>(slice_header-&gt;pic_parameter_set_id);</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  TRUE_OR_RETURN(pps);</div>
 <div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;pic_parameter_set_id));</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>* pps = <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">GetPps</a>(slice_header-&gt;pic_parameter_set_id);</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  TRUE_OR_RETURN(pps);</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>* sps = <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">GetSps</a>(pps-&gt;seq_parameter_set_id);</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  TRUE_OR_RETURN(sps);</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  <span class="keywordflow">if</span> (!slice_header-&gt;first_slice_segment_in_pic_flag) {</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;dependent_slice_segments_enabled_flag) {</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;dependent_slice_segment_flag));</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    }</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> bit_length = ceil(log2(sps-&gt;GetPicSizeInCtbsY()));</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(bit_length, &amp;slice_header-&gt;segment_address));</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  }</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  <span class="keywordflow">if</span> (!slice_header-&gt;dependent_slice_segment_flag) {</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(pps-&gt;num_extra_slice_header_bits));</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;slice_type));</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;output_flag_present_flag) {</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;pic_output_flag));</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    }</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag) {</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(2, &amp;slice_header-&gt;colour_plane_id));</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    }</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">if</span> (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() != Nalu::H265_IDR_W_RADL &amp;&amp;</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;        nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() != Nalu::H265_IDR_N_LP) {</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;                                  &amp;slice_header-&gt;slice_pic_order_cnt_lsb));</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;      TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;short_term_ref_pic_set_sps_flag));</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;      <span class="keywordflow">if</span> (!slice_header-&gt;short_term_ref_pic_set_sps_flag) {</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;        OK_OR_RETURN(ParseReferencePictureSet(</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;            sps-&gt;num_short_term_ref_pic_sets, sps-&gt;num_short_term_ref_pic_sets,</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;            sps-&gt;st_ref_pic_sets, br, &amp;slice_header-&gt;st_ref_pic_set));</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sps-&gt;num_short_term_ref_pic_sets &gt; 1) {</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;        TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;            br-&gt;ReadBits(ceil(log2(sps-&gt;num_short_term_ref_pic_sets)),</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;                         &amp;slice_header-&gt;short_term_ref_pic_set_idx));</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;      }</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;long_term_ref_pic_present_flag) {</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;        <span class="keywordflow">if</span> (sps-&gt;num_long_term_ref_pics &gt; 0) {</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_long_term_sps));</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;        }</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_long_term_pics));</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span> pic_count =</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;            slice_header-&gt;num_long_term_sps + slice_header-&gt;num_long_term_pics;</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;        slice_header-&gt;long_term_pics_info.resize(pic_count);</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pic_count; i++) {</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;          <span class="keywordflow">if</span> (i &lt; slice_header-&gt;num_long_term_sps) {</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;            <span class="keywordtype">int</span> lt_idx_sps = 0;</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;            <span class="keywordflow">if</span> (sps-&gt;num_long_term_ref_pics &gt; 1) {</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;              TRUE_OR_RETURN(br-&gt;ReadBits(</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;                  ceil(log2(sps-&gt;num_long_term_ref_pics)), &amp;lt_idx_sps));</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;            }</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;            <span class="keywordflow">if</span> (sps-&gt;used_by_curr_pic_lt_flag[lt_idx_sps])</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;              slice_header-&gt;used_by_curr_pic_lt++;</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;          } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;            TRUE_OR_RETURN(br-&gt;SkipBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 +</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;                                        4));  <span class="comment">// poc_lsb_lt</span></div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;            <span class="keywordtype">bool</span> used_by_curr_pic_lt_flag;</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;            TRUE_OR_RETURN(br-&gt;ReadBool(&amp;used_by_curr_pic_lt_flag));</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;            <span class="keywordflow">if</span> (used_by_curr_pic_lt_flag)</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;              slice_header-&gt;used_by_curr_pic_lt++;</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;          }</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;long_term_pics_info[i]</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;                                           .delta_poc_msb_present_flag));</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;          <span class="keywordflow">if</span> (slice_header-&gt;long_term_pics_info[i].delta_poc_msb_present_flag) {</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;            TRUE_OR_RETURN(br-&gt;ReadUE(</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;                &amp;slice_header-&gt;long_term_pics_info[i].delta_poc_msb_cycle_lt));</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;          }</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;        }</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;      }</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;temporal_mvp_enabled_flag) {</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;        TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;            br-&gt;ReadBool(&amp;slice_header-&gt;slice_temporal_mvp_enabled_flag));</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;      }</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;    }</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;    <span class="keywordflow">if</span> (nalu.nuh_layer_id() != 0) {</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;      NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;Multi-layer streams are not supported.&quot;</span>;</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;      <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;    }</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;sample_adaptive_offset_enabled_flag) {</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;slice_sao_luma_flag));</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;GetChromaArrayType() != 0) {</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;slice_sao_chroma_flag));</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;      }</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;    }</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    slice_header-&gt;num_ref_idx_l0_active_minus1 =</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;        pps-&gt;num_ref_idx_l0_default_active_minus1;</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;    slice_header-&gt;num_ref_idx_l1_active_minus1 =</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;        pps-&gt;num_ref_idx_l1_default_active_minus1;</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kPSlice ||</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;        slice_header-&gt;slice_type == kBSlice) {</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;      TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;num_ref_idx_active_override_flag));</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;num_ref_idx_active_override_flag) {</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_ref_idx_l0_active_minus1));</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;          TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;              br-&gt;ReadUE(&amp;slice_header-&gt;num_ref_idx_l1_active_minus1));</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;        }</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;      }</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      <span class="keyword">const</span> <span class="keywordtype">int</span> num_pic_total_curr = GetNumPicTotalCurr(*slice_header, *sps);</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;      <span class="keywordflow">if</span> (pps-&gt;lists_modification_present_flag &amp;&amp; num_pic_total_curr &gt; 1) {</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;        OK_OR_RETURN(SkipReferencePictureListModification(</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;            *slice_header, *pps, num_pic_total_curr, br));</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>* sps = <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">GetSps</a>(pps-&gt;seq_parameter_set_id);</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  TRUE_OR_RETURN(sps);</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <span class="keywordflow">if</span> (!slice_header-&gt;first_slice_segment_in_pic_flag) {</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;dependent_slice_segments_enabled_flag) {</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;dependent_slice_segment_flag));</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    }</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> bit_length = ceil(log2(sps-&gt;GetPicSizeInCtbsY()));</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(bit_length, &amp;slice_header-&gt;segment_address));</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  }</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordflow">if</span> (!slice_header-&gt;dependent_slice_segment_flag) {</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(pps-&gt;num_extra_slice_header_bits));</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;slice_type));</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;output_flag_present_flag) {</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;pic_output_flag));</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    }</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag) {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(2, &amp;slice_header-&gt;colour_plane_id));</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    }</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    <span class="keywordflow">if</span> (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() != Nalu::H265_IDR_W_RADL &amp;&amp;</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;        nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>() != Nalu::H265_IDR_N_LP) {</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;                                  &amp;slice_header-&gt;slice_pic_order_cnt_lsb));</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;      TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;short_term_ref_pic_set_sps_flag));</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;      <span class="keywordflow">if</span> (!slice_header-&gt;short_term_ref_pic_set_sps_flag) {</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;        OK_OR_RETURN(ParseReferencePictureSet(</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;            sps-&gt;num_short_term_ref_pic_sets, sps-&gt;num_short_term_ref_pic_sets,</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;            sps-&gt;st_ref_pic_sets, br, &amp;slice_header-&gt;st_ref_pic_set));</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sps-&gt;num_short_term_ref_pic_sets &gt; 1) {</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;        TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;            br-&gt;ReadBits(ceil(log2(sps-&gt;num_short_term_ref_pic_sets)),</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;                         &amp;slice_header-&gt;short_term_ref_pic_set_idx));</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;      }</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;long_term_ref_pic_present_flag) {</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;        <span class="keywordflow">if</span> (sps-&gt;num_long_term_ref_pics &gt; 0) {</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_long_term_sps));</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;        }</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_long_term_pics));</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span> pic_count =</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;            slice_header-&gt;num_long_term_sps + slice_header-&gt;num_long_term_pics;</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;        slice_header-&gt;long_term_pics_info.resize(pic_count);</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pic_count; i++) {</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;          <span class="keywordflow">if</span> (i &lt; slice_header-&gt;num_long_term_sps) {</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;            <span class="keywordtype">int</span> lt_idx_sps = 0;</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;            <span class="keywordflow">if</span> (sps-&gt;num_long_term_ref_pics &gt; 1) {</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;              TRUE_OR_RETURN(br-&gt;ReadBits(</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;                  ceil(log2(sps-&gt;num_long_term_ref_pics)), &amp;lt_idx_sps));</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;            }</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;            <span class="keywordflow">if</span> (sps-&gt;used_by_curr_pic_lt_flag[lt_idx_sps])</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;              slice_header-&gt;used_by_curr_pic_lt++;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;          } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;            TRUE_OR_RETURN(br-&gt;SkipBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 +</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;                                        4));  <span class="comment">// poc_lsb_lt</span></div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;            <span class="keywordtype">bool</span> used_by_curr_pic_lt_flag;</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;            TRUE_OR_RETURN(br-&gt;ReadBool(&amp;used_by_curr_pic_lt_flag));</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;            <span class="keywordflow">if</span> (used_by_curr_pic_lt_flag)</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;              slice_header-&gt;used_by_curr_pic_lt++;</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;          }</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;long_term_pics_info[i]</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;                                           .delta_poc_msb_present_flag));</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;          <span class="keywordflow">if</span> (slice_header-&gt;long_term_pics_info[i].delta_poc_msb_present_flag) {</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;            TRUE_OR_RETURN(br-&gt;ReadUE(</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;                &amp;slice_header-&gt;long_term_pics_info[i].delta_poc_msb_cycle_lt));</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;          }</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;        }</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;      }</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;temporal_mvp_enabled_flag) {</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;        TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;            br-&gt;ReadBool(&amp;slice_header-&gt;slice_temporal_mvp_enabled_flag));</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;      }</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;    }</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;    <span class="keywordflow">if</span> (nalu.nuh_layer_id() != 0) {</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;      NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;Multi-layer streams are not supported.&quot;</span>;</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;      <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;    }</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;sample_adaptive_offset_enabled_flag) {</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;slice_sao_luma_flag));</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;      <span class="keywordflow">if</span> (sps-&gt;GetChromaArrayType() != 0) {</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;slice_sao_chroma_flag));</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;      }</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;    }</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;    slice_header-&gt;num_ref_idx_l0_active_minus1 =</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;        pps-&gt;num_ref_idx_l0_default_active_minus1;</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;    slice_header-&gt;num_ref_idx_l1_active_minus1 =</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        pps-&gt;num_ref_idx_l1_default_active_minus1;</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kPSlice ||</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;        slice_header-&gt;slice_type == kBSlice) {</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;      TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;num_ref_idx_active_override_flag));</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;num_ref_idx_active_override_flag) {</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_ref_idx_l0_active_minus1));</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;          TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;              br-&gt;ReadUE(&amp;slice_header-&gt;num_ref_idx_l1_active_minus1));</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;        }</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;      }</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      <span class="keyword">const</span> <span class="keywordtype">int</span> num_pic_total_curr = GetNumPicTotalCurr(*slice_header, *sps);</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;      <span class="keywordflow">if</span> (pps-&gt;lists_modification_present_flag &amp;&amp; num_pic_total_curr &gt; 1) {</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;        OK_OR_RETURN(SkipReferencePictureListModification(</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;            *slice_header, *pps, num_pic_total_curr, br));</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      }</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;mvd_l1_zero_flag));</div>
 <div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;      }</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;mvd_l1_zero_flag));</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;      }</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;      <span class="keywordflow">if</span> (pps-&gt;cabac_init_present_flag) {</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;cabac_init_flag));</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;      }</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;slice_temporal_mvp_enabled_flag) {</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;collocated_from_l0));</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;        }</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;        <span class="keywordtype">bool</span> l0_greater_than_0 = slice_header-&gt;num_ref_idx_l0_active_minus1 &gt; 0;</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;        <span class="keywordtype">bool</span> l1_greater_than_0 = slice_header-&gt;num_ref_idx_l1_active_minus1 &gt; 0;</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;collocated_from_l0 ? l0_greater_than_0</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;                                             : l1_greater_than_0) {</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;collocated_ref_idx));</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;        }</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;      }</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;      <span class="keywordflow">if</span> ((pps-&gt;weighted_pred_flag &amp;&amp; slice_header-&gt;slice_type == kPSlice) ||</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;          (pps-&gt;weighted_bipred_flag &amp;&amp; slice_header-&gt;slice_type == kBSlice)) {</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;        OK_OR_RETURN(SkipPredictionWeightTable(</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;            slice_header-&gt;slice_type == kBSlice, *sps, *slice_header, br));</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;      }</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;five_minus_max_num_merge_cand));</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    }</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_qp_delta));</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;slice_chroma_qp_offsets_present_flag) {</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_cb_qp_offset));</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_cr_qp_offset));</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;    }</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;chroma_qp_offset_list_enabled_flag) {</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;      <span class="keywordflow">if</span> (pps-&gt;cabac_init_present_flag) {</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;cabac_init_flag));</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;      }</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;      <span class="keywordflow">if</span> (slice_header-&gt;slice_temporal_mvp_enabled_flag) {</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;slice_type == kBSlice) {</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadBool(&amp;slice_header-&gt;collocated_from_l0));</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;        }</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;        <span class="keywordtype">bool</span> l0_greater_than_0 = slice_header-&gt;num_ref_idx_l0_active_minus1 &gt; 0;</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;        <span class="keywordtype">bool</span> l1_greater_than_0 = slice_header-&gt;num_ref_idx_l1_active_minus1 &gt; 0;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;        <span class="keywordflow">if</span> (slice_header-&gt;collocated_from_l0 ? l0_greater_than_0</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;                                             : l1_greater_than_0) {</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;collocated_ref_idx));</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;        }</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;      }</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;      <span class="keywordflow">if</span> ((pps-&gt;weighted_pred_flag &amp;&amp; slice_header-&gt;slice_type == kPSlice) ||</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;          (pps-&gt;weighted_bipred_flag &amp;&amp; slice_header-&gt;slice_type == kBSlice)) {</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;        OK_OR_RETURN(SkipPredictionWeightTable(</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;            slice_header-&gt;slice_type == kBSlice, *sps, *slice_header, br));</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;      }</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;five_minus_max_num_merge_cand));</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;    }</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_qp_delta));</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;slice_chroma_qp_offsets_present_flag) {</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_cb_qp_offset));</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_cr_qp_offset));</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    }</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;chroma_qp_offset_list_enabled_flag) {</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;      TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;cu_chroma_qp_offset_enabled_flag));</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;    }</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_override_enabled_flag) {</div>
 <div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;      TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;cu_chroma_qp_offset_enabled_flag));</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;deblocking_filter_override_flag));</div>
 <div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;    }</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_override_enabled_flag) {</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;deblocking_filter_override_flag) {</div>
 <div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;      TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;deblocking_filter_override_flag));</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    }</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;deblocking_filter_override_flag) {</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;slice_deblocking_filter_disabled_flag));</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;      <span class="keywordflow">if</span> (!slice_header-&gt;slice_deblocking_filter_disabled_flag) {</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_beta_offset_div2));</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_tc_offset_div2));</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;      }</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;    }</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;loop_filter_across_slices_enabled_flag &amp;&amp;</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;        (slice_header-&gt;slice_sao_luma_flag ||</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;         slice_header-&gt;slice_sao_chroma_flag ||</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;         !slice_header-&gt;slice_deblocking_filter_disabled_flag)) {</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;          &amp;slice_header-&gt;slice_loop_filter_across_slices_enabled_flag));</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    }</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  }</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;tiles_enabled_flag || pps-&gt;entropy_coding_sync_enabled_flag) {</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_entry_point_offsets));</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;num_entry_point_offsets &gt; 0) {</div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;offset_len_minus1));</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;      slice_header-&gt;entry_point_offset_minus1.resize(</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;          slice_header-&gt;num_entry_point_offsets);</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; slice_header-&gt;num_entry_point_offsets; i++) {</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;        TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;            br-&gt;ReadBits(slice_header-&gt;offset_len_minus1 + 1,</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;                         &amp;slice_header-&gt;entry_point_offset_minus1[i]));</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;      }</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;    }</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;  }</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;slice_segment_header_extension_present_flag) {</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;    <span class="keywordtype">int</span> extension_length;</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;extension_length));</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(extension_length * 8));</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;  }</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;          br-&gt;ReadBool(&amp;slice_header-&gt;slice_deblocking_filter_disabled_flag));</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;      <span class="keywordflow">if</span> (!slice_header-&gt;slice_deblocking_filter_disabled_flag) {</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_beta_offset_div2));</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;slice_header-&gt;slice_tc_offset_div2));</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;      }</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;    }</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;loop_filter_across_slices_enabled_flag &amp;&amp;</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;        (slice_header-&gt;slice_sao_luma_flag ||</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;         slice_header-&gt;slice_sao_chroma_flag ||</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;         !slice_header-&gt;slice_deblocking_filter_disabled_flag)) {</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;          &amp;slice_header-&gt;slice_loop_filter_across_slices_enabled_flag));</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;    }</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;  }</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;tiles_enabled_flag || pps-&gt;entropy_coding_sync_enabled_flag) {</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;num_entry_point_offsets));</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;    <span class="keywordflow">if</span> (slice_header-&gt;num_entry_point_offsets &gt; 0) {</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;slice_header-&gt;offset_len_minus1));</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;      slice_header-&gt;entry_point_offset_minus1.resize(</div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;          slice_header-&gt;num_entry_point_offsets);</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; slice_header-&gt;num_entry_point_offsets; i++) {</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;        TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;            br-&gt;ReadBits(slice_header-&gt;offset_len_minus1 + 1,</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;                         &amp;slice_header-&gt;entry_point_offset_minus1[i]));</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;      }</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;    }</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;  }</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;slice_segment_header_extension_present_flag) {</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;    <span class="keywordtype">int</span> extension_length;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;extension_length));</div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(extension_length * 8));</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  }</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;</div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;  <span class="keywordtype">size_t</span> epb = br-&gt;NumEmulationPreventionBytesRead();</div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;  slice_header-&gt;header_bit_size =</div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;      (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>() - epb) * 8 - br-&gt;NumBitsLeft();</div>
 <div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;</div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  <span class="keywordtype">size_t</span> epb = br-&gt;NumEmulationPreventionBytesRead();</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  slice_header-&gt;header_bit_size =</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;      (nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>() - epb) * 8 - br-&gt;NumBitsLeft();</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;}</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;</div>
-<div class="line"><a name="l00404"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">  404</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">H265Parser::ParsePps</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* pps_id) {</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  DCHECK_EQ(Nalu::H265_PPS, nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>());</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;  <span class="comment">// Reads most of the element, not reading the extension data.</span></div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  *pps_id = -1;</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  std::unique_ptr&lt;H265Pps&gt; pps(<span class="keyword">new</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>);</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;pic_parameter_set_id));</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;seq_parameter_set_id));</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;dependent_slice_segments_enabled_flag));</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;output_flag_present_flag));</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(3, &amp;pps-&gt;num_extra_slice_header_bits));</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;sign_data_hiding_enabled_flag));</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;cabac_init_present_flag));</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_ref_idx_l0_default_active_minus1));</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_ref_idx_l1_default_active_minus1));</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;init_qp_minus26));</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;constrained_intra_pred_flag));</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;transform_skip_enabled_flag));</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;cu_qp_delta_enabled_flag));</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;cu_qp_delta_enabled_flag)</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;diff_cu_qp_delta_depth));</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;cb_qp_offset));</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;cr_qp_offset));</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;slice_chroma_qp_offsets_present_flag));</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;weighted_pred_flag));</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;weighted_bipred_flag));</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;transquant_bypass_enabled_flag));</div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;tiles_enabled_flag));</div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;entropy_coding_sync_enabled_flag));</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;tiles_enabled_flag) {</div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_tile_columns_minus1));</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_tile_rows_minus1));</div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;uniform_spacing_flag));</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;    <span class="keywordflow">if</span> (!pps-&gt;uniform_spacing_flag) {</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;      pps-&gt;column_width_minus1.resize(pps-&gt;num_tile_columns_minus1);</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pps-&gt;num_tile_columns_minus1; i++) {</div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;column_width_minus1[i]));</div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;}</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;</div>
+<div class="line"><a name="l00400"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">  400</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">H265Parser::ParsePps</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* pps_id) {</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  DCHECK_EQ(Nalu::H265_PPS, nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>());</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;</div>
+<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;  <span class="comment">// Reads most of the element, not reading the extension data.</span></div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  *pps_id = -1;</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  std::unique_ptr&lt;H265Pps&gt; pps(<span class="keyword">new</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>);</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;pic_parameter_set_id));</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;seq_parameter_set_id));</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;dependent_slice_segments_enabled_flag));</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;output_flag_present_flag));</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(3, &amp;pps-&gt;num_extra_slice_header_bits));</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;sign_data_hiding_enabled_flag));</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;cabac_init_present_flag));</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_ref_idx_l0_default_active_minus1));</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_ref_idx_l1_default_active_minus1));</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;init_qp_minus26));</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;constrained_intra_pred_flag));</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;transform_skip_enabled_flag));</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;cu_qp_delta_enabled_flag));</div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;cu_qp_delta_enabled_flag)</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;diff_cu_qp_delta_depth));</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;cb_qp_offset));</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;cr_qp_offset));</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;slice_chroma_qp_offsets_present_flag));</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;weighted_pred_flag));</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;weighted_bipred_flag));</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;transquant_bypass_enabled_flag));</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;tiles_enabled_flag));</div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;entropy_coding_sync_enabled_flag));</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;tiles_enabled_flag) {</div>
+<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_tile_columns_minus1));</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;num_tile_rows_minus1));</div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;uniform_spacing_flag));</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;    <span class="keywordflow">if</span> (!pps-&gt;uniform_spacing_flag) {</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;      pps-&gt;column_width_minus1.resize(pps-&gt;num_tile_columns_minus1);</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pps-&gt;num_tile_columns_minus1; i++) {</div>
+<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;column_width_minus1[i]));</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;      }</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;      pps-&gt;row_height_minus1.resize(pps-&gt;num_tile_rows_minus1);</div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pps-&gt;num_tile_rows_minus1; i++) {</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;row_height_minus1[i]));</div>
 <div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;      }</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;      pps-&gt;row_height_minus1.resize(pps-&gt;num_tile_rows_minus1);</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; pps-&gt;num_tile_rows_minus1; i++) {</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;row_height_minus1[i]));</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;      }</div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;    }</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;loop_filter_across_tiles_enabled_flag));</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  }</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;loop_filter_across_slices_enabled_flag));</div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_control_present_flag));</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_control_present_flag) {</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_override_enabled_flag));</div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_disabled_flag));</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;    <span class="keywordflow">if</span> (!pps-&gt;deblocking_filter_disabled_flag) {</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;beta_offset_div2));</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;tc_offset_div2));</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;    }</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  }</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;</div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;scaling_list_data_present_flag));</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;scaling_list_data_present_flag) {</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;    OK_OR_RETURN(SkipScalingListData(br));</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;  }</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;lists_modification_present_flag));</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;log2_parallel_merge_level_minus2));</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;      br-&gt;ReadBool(&amp;pps-&gt;slice_segment_header_extension_present_flag));</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  <span class="keywordtype">bool</span> pps_extension_present_flag;</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;  <span class="keywordtype">bool</span> pps_range_extension_flag = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps_extension_present_flag));</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  <span class="keywordflow">if</span> (pps_extension_present_flag) {</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps_range_extension_flag));</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;    <span class="comment">// pps_multilayer_extension_flag, pps_3d_extension_flag, pps_extension_5bits</span></div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1 + 1 + 5));</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;  }</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  <span class="keywordflow">if</span> (pps_range_extension_flag) {</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;transform_skip_enabled_flag) {</div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;      <span class="comment">// log2_max_transform_skip_block_size_minus2</span></div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;      <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;    }</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;</div>
-<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// cross_component_prediction_enabled_flag</span></div>
-<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;chroma_qp_offset_list_enabled_flag));</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;    <span class="comment">// Incomplete</span></div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  }</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;  <span class="comment">// Ignore remaining extension data.</span></div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;    }</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;loop_filter_across_tiles_enabled_flag));</div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;  }</div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;loop_filter_across_slices_enabled_flag));</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_control_present_flag));</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_control_present_flag) {</div>
+<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_override_enabled_flag));</div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;deblocking_filter_disabled_flag));</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;    <span class="keywordflow">if</span> (!pps-&gt;deblocking_filter_disabled_flag) {</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;beta_offset_div2));</div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;pps-&gt;tc_offset_div2));</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    }</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  }</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;</div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;scaling_list_data_present_flag));</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;scaling_list_data_present_flag) {</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;    OK_OR_RETURN(SkipScalingListData(br));</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;  }</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;lists_modification_present_flag));</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;pps-&gt;log2_parallel_merge_level_minus2));</div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;      br-&gt;ReadBool(&amp;pps-&gt;slice_segment_header_extension_present_flag));</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  <span class="keywordtype">bool</span> pps_extension_present_flag;</div>
+<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  <span class="keywordtype">bool</span> pps_range_extension_flag = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps_extension_present_flag));</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;  <span class="keywordflow">if</span> (pps_extension_present_flag) {</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps_range_extension_flag));</div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;    <span class="comment">// pps_multilayer_extension_flag, pps_3d_extension_flag, pps_extension_5bits</span></div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1 + 1 + 5));</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  }</div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  <span class="keywordflow">if</span> (pps_range_extension_flag) {</div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;transform_skip_enabled_flag) {</div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;      <span class="comment">// log2_max_transform_skip_block_size_minus2</span></div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;      <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;    }</div>
+<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;</div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// cross_component_prediction_enabled_flag</span></div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;pps-&gt;chroma_qp_offset_list_enabled_flag));</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;    <span class="comment">// Incomplete</span></div>
+<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;  }</div>
+<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;</div>
+<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;  <span class="comment">// Ignore remaining extension data.</span></div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  <span class="comment">// This will replace any existing PPS instance.</span></div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;  *pps_id = pps-&gt;pic_parameter_set_id;</div>
+<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;  active_ppses_[*pps_id] = std::move(pps);</div>
 <div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  <span class="comment">// This will replace any existing PPS instance.</span></div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;  *pps_id = pps-&gt;pic_parameter_set_id;</div>
-<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;  <span class="keyword">delete</span> active_ppses_[*pps_id];</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  active_ppses_[*pps_id] = pps.release();</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;}</div>
-<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;</div>
-<div class="line"><a name="l00513"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">  513</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">H265Parser::ParseSps</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* sps_id) {</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  DCHECK_EQ(Nalu::H265_SPS, nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>());</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;}</div>
+<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;</div>
+<div class="line"><a name="l00508"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">  508</a></span>&#160;H265Parser::Result <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">H265Parser::ParseSps</a>(<span class="keyword">const</span> <a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">Nalu</a>&amp; nalu, <span class="keywordtype">int</span>* sps_id) {</div>
+<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  DCHECK_EQ(Nalu::H265_SPS, nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">type</a>());</div>
+<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;</div>
+<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;  <span class="comment">// Reads most of the element, not reading the extension data.</span></div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
 <div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;  <span class="comment">// Reads most of the element, not reading the extension data.</span></div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a> reader;</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  reader.Initialize(nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">data</a>() + nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">header_size</a>(), nalu.<a class="code" href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">payload_size</a>());</div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br = &amp;reader;</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  *sps_id = -1;</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;  std::unique_ptr&lt;H265Sps&gt; sps(<span class="keyword">new</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>);</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;video_parameter_set_id));</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(3, &amp;sps-&gt;max_sub_layers_minus1));</div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;temporal_id_nesting_flag));</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;</div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  OK_OR_RETURN(SkipProfileTierLevel(<span class="keyword">true</span>, sps-&gt;max_sub_layers_minus1, br));</div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;seq_parameter_set_id));</div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;chroma_format_idc));</div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;chroma_format_idc == 3) {</div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;separate_colour_plane_flag));</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  }</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;pic_width_in_luma_samples));</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;pic_height_in_luma_samples));</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;conformance_window_flag));</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;conformance_window_flag) {</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_left_offset));</div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_right_offset));</div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_top_offset));</div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_bottom_offset));</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  }</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;bit_depth_luma_minus8));</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;bit_depth_chroma_minus8));</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_max_pic_order_cnt_lsb_minus4));</div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;sub_layer_ordering_info_present_flag));</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  <span class="keywordtype">int</span> start = sps-&gt;sub_layer_ordering_info_present_flag</div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;                  ? 0</div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;                  : sps-&gt;max_sub_layers_minus1;</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = start; i &lt;= sps-&gt;max_sub_layers_minus1; i++) {</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_dec_pic_buffering_minus1[i]));</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_num_reorder_pics[i]));</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_latency_increase_plus1[i]));</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  }</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_min_luma_coding_block_size_minus3));</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_luma_coding_block_size));</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_min_luma_transform_block_size_minus2));</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_luma_transform_block_size));</div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_transform_hierarchy_depth_inter));</div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_transform_hierarchy_depth_intra));</div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;</div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;scaling_list_enabled_flag));</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;scaling_list_enabled_flag) {</div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;scaling_list_data_present_flag));</div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;scaling_list_data_present_flag) {</div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;      OK_OR_RETURN(SkipScalingListData(br));</div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;    }</div>
-<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;  }</div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;amp_enabled_flag));</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;sample_adaptive_offset_enabled_flag));</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;pcm_enabled_flag));</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pcm_enabled_flag) {</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;pcm_sample_bit_depth_luma_minus1));</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;pcm_sample_bit_depth_chroma_minus1));</div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;    TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;        br-&gt;ReadUE(&amp;sps-&gt;log2_min_pcm_luma_coding_block_size_minus3));</div>
-<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;    TRUE_OR_RETURN(</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;        br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_pcm_luma_coding_block_size));</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;pcm_loop_filter_disabled_flag));</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;  }</div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;num_short_term_ref_pic_sets));</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  sps-&gt;st_ref_pic_sets.resize(sps-&gt;num_short_term_ref_pic_sets);</div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_short_term_ref_pic_sets; i++) {</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;    OK_OR_RETURN(ParseReferencePictureSet(sps-&gt;num_short_term_ref_pic_sets, i,</div>
-<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;                                          sps-&gt;st_ref_pic_sets, br,</div>
-<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;                                          &amp;sps-&gt;st_ref_pic_sets[i]));</div>
-<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  }</div>
-<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;</div>
-<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;long_term_ref_pic_present_flag));</div>
-<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;long_term_ref_pic_present_flag) {</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;num_long_term_ref_pics));</div>
-<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;    sps-&gt;lt_ref_pic_poc_lsb.resize(sps-&gt;num_long_term_ref_pics);</div>
-<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;    sps-&gt;used_by_curr_pic_lt_flag.resize(sps-&gt;num_long_term_ref_pics);</div>
-<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_long_term_ref_pics; i++) {</div>
-<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;                                  &amp;sps-&gt;lt_ref_pic_poc_lsb[i]));</div>
-<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
-<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
-<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;      sps-&gt;used_by_curr_pic_lt_flag[i] = temp;</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;    }</div>
-<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;  }</div>
-<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;</div>
-<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;temporal_mvp_enabled_flag));</div>
-<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;strong_intra_smoothing_enabled_flag));</div>
-<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;</div>
-<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;vui_parameters_present));</div>
-<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;vui_parameters_present) {</div>
-<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;    OK_OR_RETURN(ParseVuiParameters(sps-&gt;max_sub_layers_minus1, br,</div>
-<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;                                    &amp;sps-&gt;vui_parameters));</div>
-<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;  }</div>
-<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;</div>
-<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;  <span class="comment">// Ignore remaining extension data.</span></div>
-<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;</div>
-<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;  <span class="comment">// This will replace any existing SPS instance.</span></div>
-<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;  *sps_id = sps-&gt;seq_parameter_set_id;</div>
-<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;  <span class="keyword">delete</span> active_spses_[*sps_id];</div>
-<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;  active_spses_[*sps_id] = sps.release();</div>
-<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;</div>
-<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;}</div>
-<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;</div>
-<div class="line"><a name="l00630"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">  630</a></span>&#160;<span class="keyword">const</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>* <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">H265Parser::GetPps</a>(<span class="keywordtype">int</span> pps_id) {</div>
-<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;  <span class="keywordflow">return</span> active_ppses_[pps_id];</div>
-<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;}</div>
-<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;</div>
-<div class="line"><a name="l00634"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">  634</a></span>&#160;<span class="keyword">const</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>* <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">H265Parser::GetSps</a>(<span class="keywordtype">int</span> sps_id) {</div>
-<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;  <span class="keywordflow">return</span> active_spses_[sps_id];</div>
-<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;}</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;  *sps_id = -1;</div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  std::unique_ptr&lt;H265Sps&gt; sps(<span class="keyword">new</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>);</div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;video_parameter_set_id));</div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBits(3, &amp;sps-&gt;max_sub_layers_minus1));</div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;temporal_id_nesting_flag));</div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;</div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  OK_OR_RETURN(SkipProfileTierLevel(<span class="keyword">true</span>, sps-&gt;max_sub_layers_minus1, br));</div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;</div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;seq_parameter_set_id));</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;chroma_format_idc));</div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;chroma_format_idc == 3) {</div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;separate_colour_plane_flag));</div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  }</div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;pic_width_in_luma_samples));</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;pic_height_in_luma_samples));</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;</div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;conformance_window_flag));</div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;conformance_window_flag) {</div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_left_offset));</div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_right_offset));</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_top_offset));</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;conf_win_bottom_offset));</div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  }</div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;</div>
+<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;bit_depth_luma_minus8));</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;bit_depth_chroma_minus8));</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_max_pic_order_cnt_lsb_minus4));</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;sub_layer_ordering_info_present_flag));</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  <span class="keywordtype">int</span> start = sps-&gt;sub_layer_ordering_info_present_flag</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;                  ? 0</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;                  : sps-&gt;max_sub_layers_minus1;</div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = start; i &lt;= sps-&gt;max_sub_layers_minus1; i++) {</div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_dec_pic_buffering_minus1[i]));</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_num_reorder_pics[i]));</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_latency_increase_plus1[i]));</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  }</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;</div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_min_luma_coding_block_size_minus3));</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_luma_coding_block_size));</div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_min_luma_transform_block_size_minus2));</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_luma_transform_block_size));</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_transform_hierarchy_depth_inter));</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;max_transform_hierarchy_depth_intra));</div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;</div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;scaling_list_enabled_flag));</div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;scaling_list_enabled_flag) {</div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;scaling_list_data_present_flag));</div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;scaling_list_data_present_flag) {</div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;      OK_OR_RETURN(SkipScalingListData(br));</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;    }</div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;  }</div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;</div>
+<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;amp_enabled_flag));</div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;sample_adaptive_offset_enabled_flag));</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;pcm_enabled_flag));</div>
+<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pcm_enabled_flag) {</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;pcm_sample_bit_depth_luma_minus1));</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(4, &amp;sps-&gt;pcm_sample_bit_depth_chroma_minus1));</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;        br-&gt;ReadUE(&amp;sps-&gt;log2_min_pcm_luma_coding_block_size_minus3));</div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;    TRUE_OR_RETURN(</div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;        br-&gt;ReadUE(&amp;sps-&gt;log2_diff_max_min_pcm_luma_coding_block_size));</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;pcm_loop_filter_disabled_flag));</div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;  }</div>
+<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;</div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;num_short_term_ref_pic_sets));</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;  sps-&gt;st_ref_pic_sets.resize(sps-&gt;num_short_term_ref_pic_sets);</div>
+<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_short_term_ref_pic_sets; i++) {</div>
+<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;    OK_OR_RETURN(ParseReferencePictureSet(sps-&gt;num_short_term_ref_pic_sets, i,</div>
+<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;                                          sps-&gt;st_ref_pic_sets, br,</div>
+<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;                                          &amp;sps-&gt;st_ref_pic_sets[i]));</div>
+<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  }</div>
+<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;</div>
+<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;long_term_ref_pic_present_flag));</div>
+<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;long_term_ref_pic_present_flag) {</div>
+<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;sps-&gt;num_long_term_ref_pics));</div>
+<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;    sps-&gt;lt_ref_pic_poc_lsb.resize(sps-&gt;num_long_term_ref_pics);</div>
+<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;    sps-&gt;used_by_curr_pic_lt_flag.resize(sps-&gt;num_long_term_ref_pics);</div>
+<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_long_term_ref_pics; i++) {</div>
+<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
+<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;                                  &amp;sps-&gt;lt_ref_pic_poc_lsb[i]));</div>
+<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
+<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
+<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;      sps-&gt;used_by_curr_pic_lt_flag[i] = temp;</div>
+<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;    }</div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  }</div>
+<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;</div>
+<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;temporal_mvp_enabled_flag));</div>
+<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;strong_intra_smoothing_enabled_flag));</div>
+<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;</div>
+<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sps-&gt;vui_parameters_present));</div>
+<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;vui_parameters_present) {</div>
+<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;    OK_OR_RETURN(ParseVuiParameters(sps-&gt;max_sub_layers_minus1, br,</div>
+<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;                                    &amp;sps-&gt;vui_parameters));</div>
+<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;  }</div>
+<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;</div>
+<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;  <span class="comment">// Ignore remaining extension data.</span></div>
+<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;</div>
+<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;  <span class="comment">// This will replace any existing SPS instance.</span></div>
+<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;  *sps_id = sps-&gt;seq_parameter_set_id;</div>
+<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;  active_spses_[*sps_id] = std::move(sps);</div>
+<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;</div>
+<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;}</div>
+<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;</div>
+<div class="line"><a name="l00624"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">  624</a></span>&#160;<span class="keyword">const</span> <a class="code" href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a>* <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">H265Parser::GetPps</a>(<span class="keywordtype">int</span> pps_id) {</div>
+<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;  <span class="keywordflow">return</span> active_ppses_[pps_id].get();</div>
+<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;}</div>
+<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;</div>
+<div class="line"><a name="l00628"></a><span class="lineno"><a class="line" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">  628</a></span>&#160;<span class="keyword">const</span> <a class="code" href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">H265Sps</a>* <a class="code" href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">H265Parser::GetSps</a>(<span class="keywordtype">int</span> sps_id) {</div>
+<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;  <span class="keywordflow">return</span> active_spses_[sps_id].get();</div>
+<div class="line"><a name="l00630"></a><span class="lineno">  630</span>&#160;}</div>
+<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;</div>
+<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;H265Parser::Result H265Parser::ParseVuiParameters(<span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
+<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;                                                  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
+<div class="line"><a name="l00634"></a><span class="lineno">  634</span>&#160;                                                  <a class="code" href="../../d9/d67/structshaka_1_1media_1_1H265VuiParameters.html">H265VuiParameters</a>* vui) {</div>
+<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;  <span class="comment">// Reads whole element but ignores most of it.</span></div>
+<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
 <div class="line"><a name="l00637"></a><span class="lineno">  637</span>&#160;</div>
-<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;H265Parser::Result H265Parser::ParseVuiParameters(<span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
-<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;                                                  <a class="code" href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">H26xBitReader</a>* br,</div>
-<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;                                                  <a class="code" href="../../d9/d67/structshaka_1_1media_1_1H265VuiParameters.html">H265VuiParameters</a>* vui) {</div>
-<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;  <span class="comment">// Reads whole element but ignores most of it.</span></div>
-<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160;</div>
-<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui-&gt;aspect_ratio_info_present_flag));</div>
-<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;  <span class="keywordflow">if</span> (vui-&gt;aspect_ratio_info_present_flag) {</div>
-<div class="line"><a name="l00646"></a><span class="lineno">  646</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(8, &amp;vui-&gt;aspect_ratio_idc));</div>
-<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;    <span class="keywordflow">if</span> (vui-&gt;aspect_ratio_idc == H265VuiParameters::kExtendedSar) {</div>
-<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(16, &amp;vui-&gt;sar_width));</div>
-<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(16, &amp;vui-&gt;sar_height));</div>
-<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;    }</div>
+<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui-&gt;aspect_ratio_info_present_flag));</div>
+<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;  <span class="keywordflow">if</span> (vui-&gt;aspect_ratio_info_present_flag) {</div>
+<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBits(8, &amp;vui-&gt;aspect_ratio_idc));</div>
+<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;    <span class="keywordflow">if</span> (vui-&gt;aspect_ratio_idc == H265VuiParameters::kExtendedSar) {</div>
+<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(16, &amp;vui-&gt;sar_width));</div>
+<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBits(16, &amp;vui-&gt;sar_height));</div>
+<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;    }</div>
+<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;  }</div>
+<div class="line"><a name="l00646"></a><span class="lineno">  646</span>&#160;</div>
+<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;  <span class="keywordtype">bool</span> overscan_info_present_flag;</div>
+<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;overscan_info_present_flag));</div>
+<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;  <span class="keywordflow">if</span> (overscan_info_present_flag) {</div>
+<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// overscan_appropriate_flag</span></div>
 <div class="line"><a name="l00651"></a><span class="lineno">  651</span>&#160;  }</div>
 <div class="line"><a name="l00652"></a><span class="lineno">  652</span>&#160;</div>
-<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;  <span class="keywordtype">bool</span> overscan_info_present_flag;</div>
-<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;overscan_info_present_flag));</div>
-<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;  <span class="keywordflow">if</span> (overscan_info_present_flag) {</div>
-<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// overscan_appropriate_flag</span></div>
-<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;  }</div>
+<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;  <span class="keywordtype">bool</span> video_signal_type_present_flag;</div>
+<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;video_signal_type_present_flag));</div>
+<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;  <span class="keywordflow">if</span> (video_signal_type_present_flag) {</div>
+<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(3));  <span class="comment">// video_format</span></div>
+<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// video_full_range_flag</span></div>
 <div class="line"><a name="l00658"></a><span class="lineno">  658</span>&#160;</div>
-<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;  <span class="keywordtype">bool</span> video_signal_type_present_flag;</div>
-<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;video_signal_type_present_flag));</div>
-<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;  <span class="keywordflow">if</span> (video_signal_type_present_flag) {</div>
-<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(3));  <span class="comment">// video_format</span></div>
-<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// video_full_range_flag</span></div>
-<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;</div>
-<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;    <span class="keywordtype">bool</span> colour_description_present_flag;</div>
-<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;colour_description_present_flag));</div>
-<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;    <span class="keywordflow">if</span> (colour_description_present_flag) {</div>
-<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;      <span class="comment">// colour_primaries, transfer_characteristics, matrix_coeffs</span></div>
-<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(8 + 8 + 8));</div>
-<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;    }</div>
-<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160;  }</div>
-<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;</div>
-<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;  <span class="keywordtype">bool</span> chroma_loc_info_present_flag;</div>
-<div class="line"><a name="l00674"></a><span class="lineno">  674</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;chroma_loc_info_present_flag));</div>
-<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;  <span class="keywordflow">if</span> (chroma_loc_info_present_flag) {</div>
-<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;    <span class="comment">// chroma_sample_log_type_top_field, chroma_sample_log_type_bottom_field</span></div>
-<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
-<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
-<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;  }</div>
-<div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160;</div>
-<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;  <span class="comment">// neutral_chroma_indication_flag, field_seq_flag,</span></div>
-<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;  <span class="comment">// frame_field_info_present_flag.</span></div>
-<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;  TRUE_OR_RETURN(br-&gt;SkipBits(3));</div>
-<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;</div>
-<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;  <span class="keywordtype">bool</span> default_display_window_flag;</div>
-<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;default_display_window_flag));</div>
-<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;  <span class="keywordflow">if</span> (default_display_window_flag) {</div>
-<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_left_offset</span></div>
-<div class="line"><a name="l00689"></a><span class="lineno">  689</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_right_offset</span></div>
-<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_top_offset</span></div>
-<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_bottom_offset</span></div>
-<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;  }</div>
+<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;    <span class="keywordtype">bool</span> colour_description_present_flag;</div>
+<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;colour_description_present_flag));</div>
+<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;    <span class="keywordflow">if</span> (colour_description_present_flag) {</div>
+<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;      <span class="comment">// colour_primaries, transfer_characteristics, matrix_coeffs</span></div>
+<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(8 + 8 + 8));</div>
+<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;    }</div>
+<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;  }</div>
+<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;</div>
+<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;  <span class="keywordtype">bool</span> chroma_loc_info_present_flag;</div>
+<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;chroma_loc_info_present_flag));</div>
+<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;  <span class="keywordflow">if</span> (chroma_loc_info_present_flag) {</div>
+<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;    <span class="comment">// chroma_sample_log_type_top_field, chroma_sample_log_type_bottom_field</span></div>
+<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;  }</div>
+<div class="line"><a name="l00674"></a><span class="lineno">  674</span>&#160;</div>
+<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;  <span class="comment">// neutral_chroma_indication_flag, field_seq_flag,</span></div>
+<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;  <span class="comment">// frame_field_info_present_flag.</span></div>
+<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;  TRUE_OR_RETURN(br-&gt;SkipBits(3));</div>
+<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;</div>
+<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;  <span class="keywordtype">bool</span> default_display_window_flag;</div>
+<div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;default_display_window_flag));</div>
+<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;  <span class="keywordflow">if</span> (default_display_window_flag) {</div>
+<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_left_offset</span></div>
+<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_right_offset</span></div>
+<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_top_offset</span></div>
+<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// def_disp_win_bottom_offset</span></div>
+<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;  }</div>
+<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;</div>
+<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;  <span class="keywordtype">bool</span> vui_timing_info_present_flag;</div>
+<div class="line"><a name="l00689"></a><span class="lineno">  689</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_timing_info_present_flag));</div>
+<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;  <span class="keywordflow">if</span> (vui_timing_info_present_flag) {</div>
+<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;    <span class="comment">// vui_num_units_in_tick, vui_time_scale</span></div>
+<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(32 + 32));</div>
 <div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160;</div>
-<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;  <span class="keywordtype">bool</span> vui_timing_info_present_flag;</div>
-<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_timing_info_present_flag));</div>
-<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;  <span class="keywordflow">if</span> (vui_timing_info_present_flag) {</div>
-<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;    <span class="comment">// vui_num_units_in_tick, vui_time_scale</span></div>
-<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(32 + 32));</div>
-<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;</div>
-<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;    <span class="keywordtype">bool</span> vui_poc_proportional_to_timing_flag;</div>
-<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_poc_proportional_to_timing_flag));</div>
-<div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160;    <span class="keywordflow">if</span> (vui_poc_proportional_to_timing_flag) {</div>
-<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;      <span class="comment">// vui_num_ticks_poc_diff_one_minus1</span></div>
-<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;    <span class="keywordtype">bool</span> vui_poc_proportional_to_timing_flag;</div>
+<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_poc_proportional_to_timing_flag));</div>
+<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;    <span class="keywordflow">if</span> (vui_poc_proportional_to_timing_flag) {</div>
+<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;      <span class="comment">// vui_num_ticks_poc_diff_one_minus1</span></div>
+<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;    }</div>
+<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;</div>
+<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;    <span class="keywordtype">bool</span> vui_hdr_parameters_present_flag;</div>
+<div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_hdr_parameters_present_flag));</div>
+<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;    <span class="keywordflow">if</span> (vui_hdr_parameters_present_flag) {</div>
+<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;      OK_OR_RETURN(SkipHrdParameters(max_num_sub_layers_minus1, br));</div>
 <div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160;    }</div>
-<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;</div>
-<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;    <span class="keywordtype">bool</span> vui_hdr_parameters_present_flag;</div>
-<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui_hdr_parameters_present_flag));</div>
-<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;    <span class="keywordflow">if</span> (vui_hdr_parameters_present_flag) {</div>
-<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;      OK_OR_RETURN(SkipHrdParameters(max_num_sub_layers_minus1, br));</div>
-<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;    }</div>
-<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;  }</div>
+<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;  }</div>
+<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;</div>
+<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui-&gt;bitstream_restriction_flag));</div>
+<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;  <span class="keywordflow">if</span> (vui-&gt;bitstream_restriction_flag) {</div>
+<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;    <span class="comment">// tiles_fixed_structure_flag, motion_vectors_over_pic_boundaries_flag,</span></div>
+<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;    <span class="comment">// restricted_ref_pic_lists_flag.</span></div>
+<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(3));</div>
 <div class="line"><a name="l00713"></a><span class="lineno">  713</span>&#160;</div>
-<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vui-&gt;bitstream_restriction_flag));</div>
-<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;  <span class="keywordflow">if</span> (vui-&gt;bitstream_restriction_flag) {</div>
-<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;    <span class="comment">// tiles_fixed_structure_flag, motion_vectors_over_pic_boundaries_flag,</span></div>
-<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;    <span class="comment">// restricted_ref_pic_lists_flag.</span></div>
-<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(3));</div>
-<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;</div>
-<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;vui-&gt;min_spatial_segmentation_idc));</div>
-<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// max_bytes_per_pic_denom</span></div>
-<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// max_bits_per_min_cu_denum</span></div>
-<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// log2_max_mv_length_horizontal</span></div>
-<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// log2_max_mv_length_vertical</span></div>
-<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;  }</div>
-<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;</div>
-<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;}</div>
-<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;</div>
-<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;H265Parser::Result H265Parser::ParseReferencePictureSet(</div>
-<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;    <span class="keywordtype">int</span> num_short_term_ref_pic_sets,</div>
-<div class="line"><a name="l00732"></a><span class="lineno">  732</span>&#160;    <span class="keywordtype">int</span> st_rps_idx,</div>
-<div class="line"><a name="l00733"></a><span class="lineno">  733</span>&#160;    <span class="keyword">const</span> std::vector&lt;H265ReferencePictureSet&gt;&amp; ref_pic_sets,</div>
-<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;    H26xBitReader* br,</div>
-<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;    H265ReferencePictureSet* out_ref_pic_set) {</div>
-<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;  <span class="comment">// Parses and processess a short-term reference picture set.  This needs to</span></div>
-<div class="line"><a name="l00737"></a><span class="lineno">  737</span>&#160;  <span class="comment">// be done since the size of this element may be dependent on previous</span></div>
-<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;  <span class="comment">// reference picture sets.</span></div>
-<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160;</div>
-<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;  <span class="keywordtype">bool</span> inter_ref_pic_set_prediction = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;  <span class="keywordflow">if</span> (st_rps_idx != 0) {</div>
-<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;inter_ref_pic_set_prediction));</div>
-<div class="line"><a name="l00743"></a><span class="lineno">  743</span>&#160;  }</div>
-<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;</div>
-<div class="line"><a name="l00745"></a><span class="lineno">  745</span>&#160;  <span class="keywordflow">if</span> (inter_ref_pic_set_prediction) {</div>
-<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;    <span class="keywordtype">int</span> delta_idx = 1;</div>
-<div class="line"><a name="l00747"></a><span class="lineno">  747</span>&#160;    <span class="keywordflow">if</span> (st_rps_idx == num_short_term_ref_pic_sets) {</div>
-<div class="line"><a name="l00748"></a><span class="lineno">  748</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_idx));</div>
-<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160;      delta_idx++;</div>
-<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;      TRUE_OR_RETURN(delta_idx &lt;= st_rps_idx);</div>
-<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;    }</div>
-<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;</div>
-<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;    <span class="keywordtype">int</span> ref_rps_idx = st_rps_idx - delta_idx;</div>
-<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;    DCHECK_LE(0, ref_rps_idx);</div>
-<div class="line"><a name="l00755"></a><span class="lineno">  755</span>&#160;    DCHECK_LT(ref_rps_idx, st_rps_idx);</div>
-<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;</div>
-<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;    <span class="keywordtype">bool</span> delta_rps_sign;</div>
-<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;    <span class="keywordtype">int</span> abs_delta_rps_minus1;</div>
-<div class="line"><a name="l00759"></a><span class="lineno">  759</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;delta_rps_sign));</div>
-<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;abs_delta_rps_minus1));</div>
-<div class="line"><a name="l00761"></a><span class="lineno">  761</span>&#160;    <span class="keywordtype">int</span> delta_rps =</div>
-<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;        delta_rps_sign ? -(abs_delta_rps_minus1 + 1) : abs_delta_rps_minus1 + 1;</div>
-<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;</div>
-<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;    <span class="keywordtype">int</span> ref_num_delta_pocs = ref_pic_sets[ref_rps_idx].num_delta_pocs;</div>
-<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;    std::vector&lt;bool&gt; used_by_curr_pic(ref_num_delta_pocs + 1);</div>
-<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;    std::vector&lt;bool&gt; use_delta(ref_num_delta_pocs + 1);</div>
-<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt;= ref_num_delta_pocs; j++) {</div>
-<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
-<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
-<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;      used_by_curr_pic[j] = temp;</div>
-<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;</div>
-<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;      <span class="keywordflow">if</span> (!used_by_curr_pic[j]) {</div>
-<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
-<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;        use_delta[j] = temp;</div>
-<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;        use_delta[j] = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;      }</div>
-<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;    }</div>
-<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;</div>
-<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;    <span class="keywordtype">int</span> ref_num_positive_pics = ref_pic_sets[ref_rps_idx].num_positive_pics;</div>
-<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;    <span class="keywordtype">int</span> ref_num_negative_pics = ref_pic_sets[ref_rps_idx].num_negative_pics;</div>
-<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;    <span class="keywordtype">int</span> i;</div>
-<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;</div>
-<div class="line"><a name="l00784"></a><span class="lineno">  784</span>&#160;    <span class="comment">// Update list 0.</span></div>
-<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;    {</div>
-<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;      i = 0;</div>
-<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = ref_num_positive_pics - 1; j &gt;= 0; j--) {</div>
-<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s1[j] + delta_rps;</div>
-<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;        <span class="keywordflow">if</span> (d_poc &lt; 0 &amp;&amp; use_delta[ref_num_negative_pics + j]) {</div>
-<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;          out_ref_pic_set-&gt;delta_poc_s0[i] = d_poc;</div>
-<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s0[i] =</div>
-<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;              used_by_curr_pic[ref_num_negative_pics + j];</div>
-<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;          i++;</div>
-<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;        }</div>
+<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;vui-&gt;min_spatial_segmentation_idc));</div>
+<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// max_bytes_per_pic_denom</span></div>
+<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// max_bits_per_min_cu_denum</span></div>
+<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// log2_max_mv_length_horizontal</span></div>
+<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// log2_max_mv_length_vertical</span></div>
+<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;  }</div>
+<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;</div>
+<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;}</div>
+<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;</div>
+<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;H265Parser::Result H265Parser::ParseReferencePictureSet(</div>
+<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;    <span class="keywordtype">int</span> num_short_term_ref_pic_sets,</div>
+<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;    <span class="keywordtype">int</span> st_rps_idx,</div>
+<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;    <span class="keyword">const</span> std::vector&lt;H265ReferencePictureSet&gt;&amp; ref_pic_sets,</div>
+<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;    H26xBitReader* br,</div>
+<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;    H265ReferencePictureSet* out_ref_pic_set) {</div>
+<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;  <span class="comment">// Parses and processess a short-term reference picture set.  This needs to</span></div>
+<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;  <span class="comment">// be done since the size of this element may be dependent on previous</span></div>
+<div class="line"><a name="l00732"></a><span class="lineno">  732</span>&#160;  <span class="comment">// reference picture sets.</span></div>
+<div class="line"><a name="l00733"></a><span class="lineno">  733</span>&#160;</div>
+<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;  <span class="keywordtype">bool</span> inter_ref_pic_set_prediction = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;  <span class="keywordflow">if</span> (st_rps_idx != 0) {</div>
+<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;inter_ref_pic_set_prediction));</div>
+<div class="line"><a name="l00737"></a><span class="lineno">  737</span>&#160;  }</div>
+<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;</div>
+<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160;  <span class="keywordflow">if</span> (inter_ref_pic_set_prediction) {</div>
+<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;    <span class="keywordtype">int</span> delta_idx = 1;</div>
+<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;    <span class="keywordflow">if</span> (st_rps_idx == num_short_term_ref_pic_sets) {</div>
+<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_idx));</div>
+<div class="line"><a name="l00743"></a><span class="lineno">  743</span>&#160;      delta_idx++;</div>
+<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;      TRUE_OR_RETURN(delta_idx &lt;= st_rps_idx);</div>
+<div class="line"><a name="l00745"></a><span class="lineno">  745</span>&#160;    }</div>
+<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;</div>
+<div class="line"><a name="l00747"></a><span class="lineno">  747</span>&#160;    <span class="keywordtype">int</span> ref_rps_idx = st_rps_idx - delta_idx;</div>
+<div class="line"><a name="l00748"></a><span class="lineno">  748</span>&#160;    DCHECK_LE(0, ref_rps_idx);</div>
+<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160;    DCHECK_LT(ref_rps_idx, st_rps_idx);</div>
+<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;</div>
+<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;    <span class="keywordtype">bool</span> delta_rps_sign;</div>
+<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;    <span class="keywordtype">int</span> abs_delta_rps_minus1;</div>
+<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;delta_rps_sign));</div>
+<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;abs_delta_rps_minus1));</div>
+<div class="line"><a name="l00755"></a><span class="lineno">  755</span>&#160;    <span class="keywordtype">int</span> delta_rps =</div>
+<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;        delta_rps_sign ? -(abs_delta_rps_minus1 + 1) : abs_delta_rps_minus1 + 1;</div>
+<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;</div>
+<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;    <span class="keywordtype">int</span> ref_num_delta_pocs = ref_pic_sets[ref_rps_idx].num_delta_pocs;</div>
+<div class="line"><a name="l00759"></a><span class="lineno">  759</span>&#160;    std::vector&lt;bool&gt; used_by_curr_pic(ref_num_delta_pocs + 1);</div>
+<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;    std::vector&lt;bool&gt; use_delta(ref_num_delta_pocs + 1);</div>
+<div class="line"><a name="l00761"></a><span class="lineno">  761</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt;= ref_num_delta_pocs; j++) {</div>
+<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
+<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
+<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;      used_by_curr_pic[j] = temp;</div>
+<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;</div>
+<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;      <span class="keywordflow">if</span> (!used_by_curr_pic[j]) {</div>
+<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
+<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;        use_delta[j] = temp;</div>
+<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;        use_delta[j] = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;      }</div>
+<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;    }</div>
+<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;</div>
+<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;    <span class="keywordtype">int</span> ref_num_positive_pics = ref_pic_sets[ref_rps_idx].num_positive_pics;</div>
+<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;    <span class="keywordtype">int</span> ref_num_negative_pics = ref_pic_sets[ref_rps_idx].num_negative_pics;</div>
+<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;    <span class="keywordtype">int</span> i;</div>
+<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;</div>
+<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;    <span class="comment">// Update list 0.</span></div>
+<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;    {</div>
+<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;      i = 0;</div>
+<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = ref_num_positive_pics - 1; j &gt;= 0; j--) {</div>
+<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s1[j] + delta_rps;</div>
+<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;        <span class="keywordflow">if</span> (d_poc &lt; 0 &amp;&amp; use_delta[ref_num_negative_pics + j]) {</div>
+<div class="line"><a name="l00784"></a><span class="lineno">  784</span>&#160;          out_ref_pic_set-&gt;delta_poc_s0[i] = d_poc;</div>
+<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s0[i] =</div>
+<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;              used_by_curr_pic[ref_num_negative_pics + j];</div>
+<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;          i++;</div>
+<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;        }</div>
+<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;      }</div>
+<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;      <span class="keywordflow">if</span> (delta_rps &lt; 0 &amp;&amp; use_delta[ref_num_delta_pocs]) {</div>
+<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;        out_ref_pic_set-&gt;delta_poc_s0[i] = delta_rps;</div>
+<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;        out_ref_pic_set-&gt;used_by_curr_pic_s0[i] =</div>
+<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;            used_by_curr_pic[ref_num_delta_pocs];</div>
+<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;        i++;</div>
 <div class="line"><a name="l00795"></a><span class="lineno">  795</span>&#160;      }</div>
-<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;      <span class="keywordflow">if</span> (delta_rps &lt; 0 &amp;&amp; use_delta[ref_num_delta_pocs]) {</div>
-<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;        out_ref_pic_set-&gt;delta_poc_s0[i] = delta_rps;</div>
-<div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160;        out_ref_pic_set-&gt;used_by_curr_pic_s0[i] =</div>
-<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;            used_by_curr_pic[ref_num_delta_pocs];</div>
-<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;        i++;</div>
-<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;      }</div>
-<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; ref_num_negative_pics; j++) {</div>
-<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s0[j] + delta_rps;</div>
-<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;        <span class="keywordflow">if</span> (d_poc &lt; 0 &amp;&amp; use_delta[j]) {</div>
-<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;          out_ref_pic_set-&gt;delta_poc_s0[i] = d_poc;</div>
-<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s0[i] = used_by_curr_pic[j];</div>
-<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;          i++;</div>
-<div class="line"><a name="l00808"></a><span class="lineno">  808</span>&#160;        }</div>
-<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;      }</div>
-<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;      out_ref_pic_set-&gt;num_negative_pics = i;</div>
-<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;    }</div>
-<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;</div>
-<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;    <span class="comment">// Update list 1.</span></div>
-<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;    {</div>
-<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;      i = 0;</div>
-<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = ref_num_negative_pics - 1; j &gt;= 0; j--) {</div>
-<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s0[j] + delta_rps;</div>
-<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;        <span class="keywordflow">if</span> (d_poc &gt; 0 &amp;&amp; use_delta[j]) {</div>
-<div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;          out_ref_pic_set-&gt;delta_poc_s1[i] = d_poc;</div>
-<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s1[i] = used_by_curr_pic[j];</div>
-<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;          i++;</div>
-<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;        }</div>
+<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; ref_num_negative_pics; j++) {</div>
+<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s0[j] + delta_rps;</div>
+<div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160;        <span class="keywordflow">if</span> (d_poc &lt; 0 &amp;&amp; use_delta[j]) {</div>
+<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;          out_ref_pic_set-&gt;delta_poc_s0[i] = d_poc;</div>
+<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s0[i] = used_by_curr_pic[j];</div>
+<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;          i++;</div>
+<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;        }</div>
+<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;      }</div>
+<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;      out_ref_pic_set-&gt;num_negative_pics = i;</div>
+<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;    }</div>
+<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;</div>
+<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;    <span class="comment">// Update list 1.</span></div>
+<div class="line"><a name="l00808"></a><span class="lineno">  808</span>&#160;    {</div>
+<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;      i = 0;</div>
+<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = ref_num_negative_pics - 1; j &gt;= 0; j--) {</div>
+<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s0[j] + delta_rps;</div>
+<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;        <span class="keywordflow">if</span> (d_poc &gt; 0 &amp;&amp; use_delta[j]) {</div>
+<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;          out_ref_pic_set-&gt;delta_poc_s1[i] = d_poc;</div>
+<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s1[i] = used_by_curr_pic[j];</div>
+<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;          i++;</div>
+<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;        }</div>
+<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;      }</div>
+<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;      <span class="keywordflow">if</span> (delta_rps &gt; 0 &amp;&amp; use_delta[ref_num_delta_pocs]) {</div>
+<div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;        out_ref_pic_set-&gt;delta_poc_s1[i] = delta_rps;</div>
+<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;        out_ref_pic_set-&gt;used_by_curr_pic_s1[i] =</div>
+<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;            used_by_curr_pic[ref_num_delta_pocs];</div>
+<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;        i++;</div>
 <div class="line"><a name="l00823"></a><span class="lineno">  823</span>&#160;      }</div>
-<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;      <span class="keywordflow">if</span> (delta_rps &gt; 0 &amp;&amp; use_delta[ref_num_delta_pocs]) {</div>
-<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;        out_ref_pic_set-&gt;delta_poc_s1[i] = delta_rps;</div>
-<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;        out_ref_pic_set-&gt;used_by_curr_pic_s1[i] =</div>
-<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;            used_by_curr_pic[ref_num_delta_pocs];</div>
-<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;        i++;</div>
-<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;      }</div>
-<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; ref_num_positive_pics; j++) {</div>
-<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s1[j] + delta_rps;</div>
-<div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160;        <span class="keywordflow">if</span> (d_poc &gt; 0 &amp;&amp; use_delta[ref_num_negative_pics + j]) {</div>
-<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160;          out_ref_pic_set-&gt;delta_poc_s1[i] = d_poc;</div>
-<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s1[i] =</div>
-<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;              used_by_curr_pic[ref_num_negative_pics + j];</div>
-<div class="line"><a name="l00836"></a><span class="lineno">  836</span>&#160;          i++;</div>
-<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;        }</div>
-<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;      }</div>
-<div class="line"><a name="l00839"></a><span class="lineno">  839</span>&#160;      out_ref_pic_set-&gt;num_positive_pics = i;</div>
-<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;    }</div>
-<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;out_ref_pic_set-&gt;num_negative_pics));</div>
-<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;out_ref_pic_set-&gt;num_positive_pics));</div>
-<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;</div>
-<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;    <span class="keywordtype">int</span> prev_poc = 0;</div>
-<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; out_ref_pic_set-&gt;num_negative_pics; i++) {</div>
-<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;      <span class="keywordtype">int</span> delta_poc_s0_minus1;</div>
-<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_poc_s0_minus1));</div>
-<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;      out_ref_pic_set-&gt;delta_poc_s0[i] = prev_poc - (delta_poc_s0_minus1 + 1);</div>
-<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;      prev_poc = out_ref_pic_set-&gt;delta_poc_s0[i];</div>
-<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;</div>
-<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;out_ref_pic_set-&gt;used_by_curr_pic_s0[i]));</div>
-<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;    }</div>
-<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160;</div>
-<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;    prev_poc = 0;</div>
-<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; out_ref_pic_set-&gt;num_positive_pics; i++) {</div>
-<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160;      <span class="keywordtype">int</span> delta_poc_s1_minus1;</div>
-<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_poc_s1_minus1));</div>
-<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;      out_ref_pic_set-&gt;delta_poc_s1[i] = prev_poc + delta_poc_s1_minus1 + 1;</div>
-<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;      prev_poc = out_ref_pic_set-&gt;delta_poc_s1[i];</div>
-<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;</div>
-<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;out_ref_pic_set-&gt;used_by_curr_pic_s1[i]));</div>
-<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;    }</div>
-<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;  }</div>
-<div class="line"><a name="l00865"></a><span class="lineno">  865</span>&#160;</div>
-<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;  out_ref_pic_set-&gt;num_delta_pocs =</div>
-<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;      out_ref_pic_set-&gt;num_positive_pics + out_ref_pic_set-&gt;num_negative_pics;</div>
-<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;}</div>
-<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;</div>
-<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;H265Parser::Result H265Parser::SkipReferencePictureListModification(</div>
-<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;    <span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
-<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;    <span class="keyword">const</span> H265Pps&amp; pps,</div>
-<div class="line"><a name="l00874"></a><span class="lineno">  874</span>&#160;    <span class="keywordtype">int</span> num_pic_total_curr,</div>
-<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;    H26xBitReader* br) {</div>
-<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;  <span class="comment">// Reads whole element but ignores it all.</span></div>
-<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;</div>
-<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l0;</div>
-<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;ref_pic_list_modification_flag_l0));</div>
-<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;  <span class="keywordflow">if</span> (ref_pic_list_modification_flag_l0) {</div>
-<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= pps.num_ref_idx_l0_default_active_minus1; i++) {</div>
-<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(ceil(log2(num_pic_total_curr))));</div>
-<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;    }</div>
-<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;  }</div>
-<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;</div>
-<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;  <span class="keywordflow">if</span> (slice_header.slice_type == kBSlice) {</div>
-<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;    <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l1;</div>
-<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;ref_pic_list_modification_flag_l1));</div>
-<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;    <span class="keywordflow">if</span> (ref_pic_list_modification_flag_l1) {</div>
-<div class="line"><a name="l00890"></a><span class="lineno">  890</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= pps.num_ref_idx_l1_default_active_minus1; i++) {</div>
-<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(ceil(log2(num_pic_total_curr))));</div>
-<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;      }</div>
-<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;    }</div>
-<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;  }</div>
-<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;</div>
-<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;}</div>
-<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;</div>
-<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;H265Parser::Result H265Parser::SkipPredictionWeightTablePart(</div>
-<div class="line"><a name="l00900"></a><span class="lineno">  900</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_minus1,</div>
-<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;    <span class="keywordtype">int</span> chroma_array_type,</div>
-<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;    H26xBitReader* br) {</div>
-<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
-<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;  std::vector&lt;bool&gt; luma_weight_flag(num_ref_idx_minus1 + 1);</div>
-<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;  std::vector&lt;bool&gt; chroma_weight_flag(num_ref_idx_minus1 + 1);</div>
-<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;</div>
-<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
-<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;    <span class="keywordtype">bool</span> temp;</div>
-<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
-<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;    luma_weight_flag[i] = temp;</div>
-<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;  }</div>
-<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;  <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
-<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
-<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
-<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
-<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;      chroma_weight_flag[i] = temp;</div>
+<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; ref_num_positive_pics; j++) {</div>
+<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;        <span class="keywordtype">int</span> d_poc = ref_pic_sets[ref_rps_idx].delta_poc_s1[j] + delta_rps;</div>
+<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;        <span class="keywordflow">if</span> (d_poc &gt; 0 &amp;&amp; use_delta[ref_num_negative_pics + j]) {</div>
+<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;          out_ref_pic_set-&gt;delta_poc_s1[i] = d_poc;</div>
+<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;          out_ref_pic_set-&gt;used_by_curr_pic_s1[i] =</div>
+<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;              used_by_curr_pic[ref_num_negative_pics + j];</div>
+<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;          i++;</div>
+<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;        }</div>
+<div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160;      }</div>
+<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160;      out_ref_pic_set-&gt;num_positive_pics = i;</div>
+<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;    }</div>
+<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00836"></a><span class="lineno">  836</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;out_ref_pic_set-&gt;num_negative_pics));</div>
+<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;out_ref_pic_set-&gt;num_positive_pics));</div>
+<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;</div>
+<div class="line"><a name="l00839"></a><span class="lineno">  839</span>&#160;    <span class="keywordtype">int</span> prev_poc = 0;</div>
+<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; out_ref_pic_set-&gt;num_negative_pics; i++) {</div>
+<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;      <span class="keywordtype">int</span> delta_poc_s0_minus1;</div>
+<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_poc_s0_minus1));</div>
+<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;      out_ref_pic_set-&gt;delta_poc_s0[i] = prev_poc - (delta_poc_s0_minus1 + 1);</div>
+<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;      prev_poc = out_ref_pic_set-&gt;delta_poc_s0[i];</div>
+<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;</div>
+<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;out_ref_pic_set-&gt;used_by_curr_pic_s0[i]));</div>
+<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;    }</div>
+<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;</div>
+<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;    prev_poc = 0;</div>
+<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; out_ref_pic_set-&gt;num_positive_pics; i++) {</div>
+<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;      <span class="keywordtype">int</span> delta_poc_s1_minus1;</div>
+<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;delta_poc_s1_minus1));</div>
+<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;      out_ref_pic_set-&gt;delta_poc_s1[i] = prev_poc + delta_poc_s1_minus1 + 1;</div>
+<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160;      prev_poc = out_ref_pic_set-&gt;delta_poc_s1[i];</div>
+<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;</div>
+<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;out_ref_pic_set-&gt;used_by_curr_pic_s1[i]));</div>
+<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160;    }</div>
+<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;  }</div>
+<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;</div>
+<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;  out_ref_pic_set-&gt;num_delta_pocs =</div>
+<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;      out_ref_pic_set-&gt;num_positive_pics + out_ref_pic_set-&gt;num_negative_pics;</div>
+<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;}</div>
+<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;</div>
+<div class="line"><a name="l00865"></a><span class="lineno">  865</span>&#160;H265Parser::Result H265Parser::SkipReferencePictureListModification(</div>
+<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;    <span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
+<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;    <span class="keyword">const</span> H265Pps&amp; pps,</div>
+<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160;    <span class="keywordtype">int</span> num_pic_total_curr,</div>
+<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;    H26xBitReader* br) {</div>
+<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;  <span class="comment">// Reads whole element but ignores it all.</span></div>
+<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;</div>
+<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;  <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l0;</div>
+<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadBool(&amp;ref_pic_list_modification_flag_l0));</div>
+<div class="line"><a name="l00874"></a><span class="lineno">  874</span>&#160;  <span class="keywordflow">if</span> (ref_pic_list_modification_flag_l0) {</div>
+<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= pps.num_ref_idx_l0_default_active_minus1; i++) {</div>
+<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(ceil(log2(num_pic_total_curr))));</div>
+<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;    }</div>
+<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;  }</div>
+<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;</div>
+<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;  <span class="keywordflow">if</span> (slice_header.slice_type == kBSlice) {</div>
+<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;    <span class="keywordtype">bool</span> ref_pic_list_modification_flag_l1;</div>
+<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;ref_pic_list_modification_flag_l1));</div>
+<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;    <span class="keywordflow">if</span> (ref_pic_list_modification_flag_l1) {</div>
+<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= pps.num_ref_idx_l1_default_active_minus1; i++) {</div>
+<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(ceil(log2(num_pic_total_curr))));</div>
+<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;      }</div>
+<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;    }</div>
+<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;  }</div>
+<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;</div>
+<div class="line"><a name="l00890"></a><span class="lineno">  890</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;}</div>
+<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;</div>
+<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;H265Parser::Result H265Parser::SkipPredictionWeightTablePart(</div>
+<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_minus1,</div>
+<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;    <span class="keywordtype">int</span> chroma_array_type,</div>
+<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;    H26xBitReader* br) {</div>
+<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
+<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;  std::vector&lt;bool&gt; luma_weight_flag(num_ref_idx_minus1 + 1);</div>
+<div class="line"><a name="l00900"></a><span class="lineno">  900</span>&#160;  std::vector&lt;bool&gt; chroma_weight_flag(num_ref_idx_minus1 + 1);</div>
+<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;</div>
+<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
+<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;    <span class="keywordtype">bool</span> temp;</div>
+<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
+<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;    luma_weight_flag[i] = temp;</div>
+<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;  }</div>
+<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;  <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
+<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
+<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;      <span class="keywordtype">bool</span> temp;</div>
+<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;temp));</div>
+<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;      chroma_weight_flag[i] = temp;</div>
+<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;    }</div>
+<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;  }</div>
+<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
+<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;    <span class="keywordflow">if</span> (luma_weight_flag[i]) {</div>
+<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_luma_weight_l#</span></div>
+<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// luma_offset_l#</span></div>
 <div class="line"><a name="l00918"></a><span class="lineno">  918</span>&#160;    }</div>
-<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;  }</div>
-<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= num_ref_idx_minus1; i++) {</div>
-<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;    <span class="keywordflow">if</span> (luma_weight_flag[i]) {</div>
-<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_luma_weight_l#</span></div>
-<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// luma_offset_l#</span></div>
+<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;    <span class="keywordflow">if</span> (chroma_weight_flag[i]) {</div>
+<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; j++) {</div>
+<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_weight_l#</span></div>
+<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_offset_l#</span></div>
+<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;      }</div>
 <div class="line"><a name="l00924"></a><span class="lineno">  924</span>&#160;    }</div>
-<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;    <span class="keywordflow">if</span> (chroma_weight_flag[i]) {</div>
-<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;      <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; j++) {</div>
-<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_weight_l#</span></div>
-<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_offset_l#</span></div>
-<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;      }</div>
-<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;    }</div>
-<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;  }</div>
-<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;</div>
-<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;}</div>
-<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;</div>
-<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;H265Parser::Result H265Parser::SkipPredictionWeightTable(</div>
-<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;    <span class="keywordtype">bool</span> is_b_slice,</div>
-<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;    <span class="keyword">const</span> H265Sps&amp; sps,</div>
-<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;    <span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
-<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;    H26xBitReader* br) {</div>
-<div class="line"><a name="l00941"></a><span class="lineno">  941</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
-<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;  <span class="keywordtype">int</span> chroma_array_type = sps.GetChromaArrayType();</div>
-<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;</div>
-<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// luma_log2_weight_denom</span></div>
-<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;  <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
-<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_log2_weight_denom</span></div>
+<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;  }</div>
+<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;</div>
+<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;}</div>
+<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;</div>
+<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;H265Parser::Result H265Parser::SkipPredictionWeightTable(</div>
+<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;    <span class="keywordtype">bool</span> is_b_slice,</div>
+<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;    <span class="keyword">const</span> H265Sps&amp; sps,</div>
+<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;    <span class="keyword">const</span> H265SliceHeader&amp; slice_header,</div>
+<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;    H26xBitReader* br) {</div>
+<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
+<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;  <span class="keywordtype">int</span> chroma_array_type = sps.GetChromaArrayType();</div>
+<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;</div>
+<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;  TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// luma_log2_weight_denom</span></div>
+<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;  <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
+<div class="line"><a name="l00941"></a><span class="lineno">  941</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// delta_chroma_log2_weight_denom</span></div>
+<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;  }</div>
+<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;  OK_OR_RETURN(SkipPredictionWeightTablePart(</div>
+<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;      slice_header.num_ref_idx_l0_active_minus1, chroma_array_type, br));</div>
+<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;  <span class="keywordflow">if</span> (is_b_slice) {</div>
+<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;    OK_OR_RETURN(SkipPredictionWeightTablePart(</div>
+<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;        slice_header.num_ref_idx_l1_active_minus1, chroma_array_type, br));</div>
 <div class="line"><a name="l00948"></a><span class="lineno">  948</span>&#160;  }</div>
-<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;  OK_OR_RETURN(SkipPredictionWeightTablePart(</div>
-<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;      slice_header.num_ref_idx_l0_active_minus1, chroma_array_type, br));</div>
-<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;  <span class="keywordflow">if</span> (is_b_slice) {</div>
-<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;    OK_OR_RETURN(SkipPredictionWeightTablePart(</div>
-<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;        slice_header.num_ref_idx_l1_active_minus1, chroma_array_type, br));</div>
-<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;  }</div>
-<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;</div>
-<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;}</div>
+<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;</div>
+<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;}</div>
+<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;</div>
+<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;H265Parser::Result H265Parser::SkipProfileTierLevel(</div>
+<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;    <span class="keywordtype">bool</span> profile_present,</div>
+<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;    <span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
+<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;    H26xBitReader* br) {</div>
+<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
 <div class="line"><a name="l00958"></a><span class="lineno">  958</span>&#160;</div>
-<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;H265Parser::Result H265Parser::SkipProfileTierLevel(</div>
-<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;    <span class="keywordtype">bool</span> profile_present,</div>
-<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;    <span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
-<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;    H26xBitReader* br) {</div>
-<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
-<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;</div>
-<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;  <span class="keywordflow">if</span> (profile_present) {</div>
-<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;    <span class="comment">// general_profile_space, general_tier_flag, general_profile_idc</span></div>
-<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;    <span class="comment">// general_profile_compativility_flag</span></div>
-<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;    <span class="comment">// general_progressive_source_flag</span></div>
-<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;    <span class="comment">// general_interlaced_source_flag</span></div>
-<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;    <span class="comment">// general_non_packed_constraint_flag</span></div>
-<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;    <span class="comment">// general_frame_only_constraint_flag</span></div>
-<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;    <span class="comment">// 44-bits of other flags</span></div>
-<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(2 + 1 + 5 + 32 + 4 + 44));</div>
-<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;  }</div>
-<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;</div>
-<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;  TRUE_OR_RETURN(br-&gt;SkipBits(8));  <span class="comment">// general_level_idc</span></div>
-<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;</div>
-<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;  std::vector&lt;bool&gt; sub_layer_profile_present(max_num_sub_layers_minus1);</div>
-<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;  std::vector&lt;bool&gt; sub_layer_level_present(max_num_sub_layers_minus1);</div>
-<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; max_num_sub_layers_minus1; i++) {</div>
-<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;    <span class="keywordtype">bool</span> profile, level;</div>
-<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;profile));</div>
-<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;level));</div>
-<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;    sub_layer_profile_present[i] = profile;</div>
-<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;    sub_layer_level_present[i] = level;</div>
-<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;  }</div>
-<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;</div>
-<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;  <span class="keywordflow">if</span> (max_num_sub_layers_minus1 &gt; 0) {</div>
-<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = max_num_sub_layers_minus1; i &lt; 8; i++)</div>
-<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(2));  <span class="comment">// reserved_zero_2bits</span></div>
-<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;  }</div>
-<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;</div>
-<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; max_num_sub_layers_minus1; i++) {</div>
-<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;    <span class="keywordflow">if</span> (sub_layer_profile_present[i]) {</div>
-<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;      <span class="comment">// sub_layer_profile_space, sub_layer_tier_flag, sub_layer_profile_idc</span></div>
-<div class="line"><a name="l00996"></a><span class="lineno">  996</span>&#160;      <span class="comment">// sub_layer_profile_compatibility</span></div>
-<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;      <span class="comment">// sub_layer_reserved_zero_43bits</span></div>
-<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;      <span class="comment">// sub_layer_reserved_zero_bit</span></div>
-<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(2 + 1 + 5 + 32 + 4 + 43 + 1));</div>
-<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;    }</div>
-<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;    <span class="keywordflow">if</span> (sub_layer_level_present[i]) {</div>
-<div class="line"><a name="l01002"></a><span class="lineno"> 1002</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(8));</div>
-<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;    }</div>
-<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;  }</div>
-<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;</div>
-<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;}</div>
-<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;</div>
-<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;H265Parser::Result H265Parser::SkipScalingListData(H26xBitReader* br) {</div>
-<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
-<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> size_id = 0; size_id &lt; 4; size_id++) {</div>
-<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> matrix_id = 0; matrix_id &lt; 6;</div>
-<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;         matrix_id += ((size_id == 3) ? 3 : 1)) {</div>
-<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;      <span class="keywordtype">bool</span> scaling_list_pred_mode;</div>
-<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;scaling_list_pred_mode));</div>
-<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;      <span class="keywordflow">if</span> (!scaling_list_pred_mode) {</div>
-<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;        <span class="comment">// scaling_list_pred_matrix_id_delta</span></div>
-<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
-<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;        <span class="keywordtype">int</span> coefNum = std::min(64, (1 &lt;&lt; (4 + (size_id &lt;&lt; 1))));</div>
-<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;        <span class="keywordflow">if</span> (size_id &gt; 1) {</div>
-<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// scaling_list_dc_coef_minus8</span></div>
-<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;        }</div>
-<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;</div>
-<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; coefNum; i++) {</div>
-<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// scaling_list_delta_coef</span></div>
-<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;        }</div>
-<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;      }</div>
-<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;    }</div>
-<div class="line"><a name="l01031"></a><span class="lineno"> 1031</span>&#160;  }</div>
-<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;</div>
-<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;}</div>
-<div class="line"><a name="l01035"></a><span class="lineno"> 1035</span>&#160;</div>
-<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;H265Parser::Result H265Parser::SkipHrdParameters(<span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
-<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;                                                 H26xBitReader* br) {</div>
-<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;  <span class="comment">// common_inf_present_flag is always 1 when parsing vui_parameters.</span></div>
-<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> common_inf_present_flag = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;</div>
-<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;  <span class="keywordtype">bool</span> nal_hdr_parameters_present_flag;</div>
-<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;  <span class="keywordtype">bool</span> vcl_hdr_parameters_present_flag;</div>
-<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;  <span class="keywordtype">bool</span> sub_pic_hdr_params_present_flag = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;  <span class="keywordflow">if</span> (common_inf_present_flag) {</div>
-<div class="line"><a name="l01046"></a><span class="lineno"> 1046</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;nal_hdr_parameters_present_flag));</div>
-<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vcl_hdr_parameters_present_flag));</div>
-<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;    <span class="keywordflow">if</span> (nal_hdr_parameters_present_flag || vcl_hdr_parameters_present_flag) {</div>
-<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sub_pic_hdr_params_present_flag));</div>
-<div class="line"><a name="l01050"></a><span class="lineno"> 1050</span>&#160;      <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag) {</div>
-<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;        <span class="comment">// tick_divisor_minus2, du_cpb_removal_delay_increment_length_minus1,</span></div>
-<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;        <span class="comment">// sub_pic_cpb_params_in_pic_timing_sei_flag</span></div>
-<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;        <span class="comment">// dpb_output_delay_du_length_minus1</span></div>
-<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(8 + 5 + 1 + 5));</div>
-<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;      }</div>
-<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;</div>
-<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;      <span class="comment">// bit_rate_scale, cpb_size_scale</span></div>
-<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(4 + 4));</div>
-<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;      <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag)</div>
-<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(4));  <span class="comment">// cpb_size_du_scale</span></div>
+<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;  <span class="keywordflow">if</span> (profile_present) {</div>
+<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;    <span class="comment">// general_profile_space, general_tier_flag, general_profile_idc</span></div>
+<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;    <span class="comment">// general_profile_compativility_flag</span></div>
+<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;    <span class="comment">// general_progressive_source_flag</span></div>
+<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;    <span class="comment">// general_interlaced_source_flag</span></div>
+<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;    <span class="comment">// general_non_packed_constraint_flag</span></div>
+<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;    <span class="comment">// general_frame_only_constraint_flag</span></div>
+<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;    <span class="comment">// 44-bits of other flags</span></div>
+<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(2 + 1 + 5 + 32 + 4 + 44));</div>
+<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;  }</div>
+<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;</div>
+<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;  TRUE_OR_RETURN(br-&gt;SkipBits(8));  <span class="comment">// general_level_idc</span></div>
+<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;</div>
+<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;  std::vector&lt;bool&gt; sub_layer_profile_present(max_num_sub_layers_minus1);</div>
+<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;  std::vector&lt;bool&gt; sub_layer_level_present(max_num_sub_layers_minus1);</div>
+<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; max_num_sub_layers_minus1; i++) {</div>
+<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;    <span class="keywordtype">bool</span> profile, level;</div>
+<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;profile));</div>
+<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;level));</div>
+<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;    sub_layer_profile_present[i] = profile;</div>
+<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;    sub_layer_level_present[i] = level;</div>
+<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;  }</div>
+<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;</div>
+<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;  <span class="keywordflow">if</span> (max_num_sub_layers_minus1 &gt; 0) {</div>
+<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = max_num_sub_layers_minus1; i &lt; 8; i++)</div>
+<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(2));  <span class="comment">// reserved_zero_2bits</span></div>
+<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;  }</div>
+<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;</div>
+<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; max_num_sub_layers_minus1; i++) {</div>
+<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;    <span class="keywordflow">if</span> (sub_layer_profile_present[i]) {</div>
+<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;      <span class="comment">// sub_layer_profile_space, sub_layer_tier_flag, sub_layer_profile_idc</span></div>
+<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;      <span class="comment">// sub_layer_profile_compatibility</span></div>
+<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;      <span class="comment">// sub_layer_reserved_zero_43bits</span></div>
+<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;      <span class="comment">// sub_layer_reserved_zero_bit</span></div>
+<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(2 + 1 + 5 + 32 + 4 + 43 + 1));</div>
+<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;    }</div>
+<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;    <span class="keywordflow">if</span> (sub_layer_level_present[i]) {</div>
+<div class="line"><a name="l00996"></a><span class="lineno">  996</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(8));</div>
+<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;    }</div>
+<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;  }</div>
+<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;</div>
+<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;}</div>
+<div class="line"><a name="l01002"></a><span class="lineno"> 1002</span>&#160;</div>
+<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;H265Parser::Result H265Parser::SkipScalingListData(H26xBitReader* br) {</div>
+<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;  <span class="comment">// Reads whole element, ignores it.</span></div>
+<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> size_id = 0; size_id &lt; 4; size_id++) {</div>
+<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> matrix_id = 0; matrix_id &lt; 6;</div>
+<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;         matrix_id += ((size_id == 3) ? 3 : 1)) {</div>
+<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;      <span class="keywordtype">bool</span> scaling_list_pred_mode;</div>
+<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;scaling_list_pred_mode));</div>
+<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;      <span class="keywordflow">if</span> (!scaling_list_pred_mode) {</div>
+<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;        <span class="comment">// scaling_list_pred_matrix_id_delta</span></div>
+<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;        TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));</div>
+<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;        <span class="keywordtype">int</span> coefNum = std::min(64, (1 &lt;&lt; (4 + (size_id &lt;&lt; 1))));</div>
+<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;        <span class="keywordflow">if</span> (size_id &gt; 1) {</div>
+<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// scaling_list_dc_coef_minus8</span></div>
+<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;        }</div>
+<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;</div>
+<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; coefNum; i++) {</div>
+<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;          TRUE_OR_RETURN(br-&gt;ReadSE(&amp;ignored));  <span class="comment">// scaling_list_delta_coef</span></div>
+<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;        }</div>
+<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;      }</div>
+<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;    }</div>
+<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;  }</div>
+<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;</div>
+<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;}</div>
+<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;</div>
+<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;H265Parser::Result H265Parser::SkipHrdParameters(<span class="keywordtype">int</span> max_num_sub_layers_minus1,</div>
+<div class="line"><a name="l01031"></a><span class="lineno"> 1031</span>&#160;                                                 H26xBitReader* br) {</div>
+<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;  <span class="comment">// common_inf_present_flag is always 1 when parsing vui_parameters.</span></div>
+<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> common_inf_present_flag = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;</div>
+<div class="line"><a name="l01035"></a><span class="lineno"> 1035</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;  <span class="keywordtype">bool</span> nal_hdr_parameters_present_flag;</div>
+<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;  <span class="keywordtype">bool</span> vcl_hdr_parameters_present_flag;</div>
+<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;  <span class="keywordtype">bool</span> sub_pic_hdr_params_present_flag = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;  <span class="keywordflow">if</span> (common_inf_present_flag) {</div>
+<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;nal_hdr_parameters_present_flag));</div>
+<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;vcl_hdr_parameters_present_flag));</div>
+<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;    <span class="keywordflow">if</span> (nal_hdr_parameters_present_flag || vcl_hdr_parameters_present_flag) {</div>
+<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;sub_pic_hdr_params_present_flag));</div>
+<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;      <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag) {</div>
+<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;        <span class="comment">// tick_divisor_minus2, du_cpb_removal_delay_increment_length_minus1,</span></div>
+<div class="line"><a name="l01046"></a><span class="lineno"> 1046</span>&#160;        <span class="comment">// sub_pic_cpb_params_in_pic_timing_sei_flag</span></div>
+<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;        <span class="comment">// dpb_output_delay_du_length_minus1</span></div>
+<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(8 + 5 + 1 + 5));</div>
+<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;      }</div>
+<div class="line"><a name="l01050"></a><span class="lineno"> 1050</span>&#160;</div>
+<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;      <span class="comment">// bit_rate_scale, cpb_size_scale</span></div>
+<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(4 + 4));</div>
+<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;      <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag)</div>
+<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;        TRUE_OR_RETURN(br-&gt;SkipBits(4));  <span class="comment">// cpb_size_du_scale</span></div>
+<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;</div>
+<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;      <span class="comment">// initial_cpb_removal_delay_length_minus1,</span></div>
+<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;      <span class="comment">// au_cpb_removal_delay_length_minus1, dpb_output_delay_length_minus1</span></div>
+<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(5 + 5 + 5));</div>
+<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;    }</div>
+<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;  }</div>
 <div class="line"><a name="l01061"></a><span class="lineno"> 1061</span>&#160;</div>
-<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;      <span class="comment">// initial_cpb_removal_delay_length_minus1,</span></div>
-<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;      <span class="comment">// au_cpb_removal_delay_length_minus1, dpb_output_delay_length_minus1</span></div>
-<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;      TRUE_OR_RETURN(br-&gt;SkipBits(5 + 5 + 5));</div>
-<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;    }</div>
-<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;  }</div>
-<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;</div>
-<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= max_num_sub_layers_minus1; i++) {</div>
-<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;    <span class="keywordtype">bool</span> fixed_pic_rate_general_flag;</div>
-<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;    <span class="keywordtype">bool</span> fixed_pic_rate_within_cvs_flag = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;    <span class="keywordtype">bool</span> low_delay_hdr_flag = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;    <span class="keywordtype">int</span> cpb_cnt_minus1 = 0;</div>
-<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;fixed_pic_rate_general_flag));</div>
-<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;    <span class="keywordflow">if</span> (!fixed_pic_rate_general_flag)</div>
-<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;fixed_pic_rate_within_cvs_flag));</div>
-<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;    <span class="keywordflow">if</span> (fixed_pic_rate_within_cvs_flag)</div>
-<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// elemental_duration_ic_tc_minus1</span></div>
-<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;    <span class="keywordflow">else</span></div>
-<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;low_delay_hdr_flag));</div>
-<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;    <span class="keywordflow">if</span> (!low_delay_hdr_flag)</div>
-<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;cpb_cnt_minus1));</div>
-<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;</div>
-<div class="line"><a name="l01083"></a><span class="lineno"> 1083</span>&#160;    <span class="keywordflow">if</span> (nal_hdr_parameters_present_flag) {</div>
-<div class="line"><a name="l01084"></a><span class="lineno"> 1084</span>&#160;      OK_OR_RETURN(SkipSubLayerHrdParameters(</div>
-<div class="line"><a name="l01085"></a><span class="lineno"> 1085</span>&#160;          cpb_cnt_minus1, sub_pic_hdr_params_present_flag, br));</div>
-<div class="line"><a name="l01086"></a><span class="lineno"> 1086</span>&#160;    }</div>
-<div class="line"><a name="l01087"></a><span class="lineno"> 1087</span>&#160;    <span class="keywordflow">if</span> (vcl_hdr_parameters_present_flag) {</div>
-<div class="line"><a name="l01088"></a><span class="lineno"> 1088</span>&#160;      OK_OR_RETURN(SkipSubLayerHrdParameters(</div>
-<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;          cpb_cnt_minus1, sub_pic_hdr_params_present_flag, br));</div>
-<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;    }</div>
-<div class="line"><a name="l01091"></a><span class="lineno"> 1091</span>&#160;  }</div>
-<div class="line"><a name="l01092"></a><span class="lineno"> 1092</span>&#160;</div>
-<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01094"></a><span class="lineno"> 1094</span>&#160;}</div>
-<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;</div>
-<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;H265Parser::Result H265Parser::SkipSubLayerHrdParameters(</div>
-<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;    <span class="keywordtype">int</span> cpb_cnt_minus1,</div>
-<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160;    <span class="keywordtype">bool</span> sub_pic_hdr_params_present_flag,</div>
-<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;    H26xBitReader* br) {</div>
-<div class="line"><a name="l01100"></a><span class="lineno"> 1100</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
-<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= cpb_cnt_minus1; i++) {</div>
-<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// bit_rate_value_minus1</span></div>
-<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// cpb_size_value_minus1</span></div>
-<div class="line"><a name="l01104"></a><span class="lineno"> 1104</span>&#160;    <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag) {</div>
-<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// cpb_size_du_value_minus1</span></div>
-<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// bit_rate_du_value_minus1</span></div>
-<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;    }</div>
+<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= max_num_sub_layers_minus1; i++) {</div>
+<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;    <span class="keywordtype">bool</span> fixed_pic_rate_general_flag;</div>
+<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;    <span class="keywordtype">bool</span> fixed_pic_rate_within_cvs_flag = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;    <span class="keywordtype">bool</span> low_delay_hdr_flag = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;    <span class="keywordtype">int</span> cpb_cnt_minus1 = 0;</div>
+<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadBool(&amp;fixed_pic_rate_general_flag));</div>
+<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;    <span class="keywordflow">if</span> (!fixed_pic_rate_general_flag)</div>
+<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;fixed_pic_rate_within_cvs_flag));</div>
+<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;    <span class="keywordflow">if</span> (fixed_pic_rate_within_cvs_flag)</div>
+<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// elemental_duration_ic_tc_minus1</span></div>
+<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;    <span class="keywordflow">else</span></div>
+<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadBool(&amp;low_delay_hdr_flag));</div>
+<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;    <span class="keywordflow">if</span> (!low_delay_hdr_flag)</div>
+<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;cpb_cnt_minus1));</div>
+<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;</div>
+<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;    <span class="keywordflow">if</span> (nal_hdr_parameters_present_flag) {</div>
+<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;      OK_OR_RETURN(SkipSubLayerHrdParameters(</div>
+<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;          cpb_cnt_minus1, sub_pic_hdr_params_present_flag, br));</div>
+<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;    }</div>
+<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;    <span class="keywordflow">if</span> (vcl_hdr_parameters_present_flag) {</div>
+<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;      OK_OR_RETURN(SkipSubLayerHrdParameters(</div>
+<div class="line"><a name="l01083"></a><span class="lineno"> 1083</span>&#160;          cpb_cnt_minus1, sub_pic_hdr_params_present_flag, br));</div>
+<div class="line"><a name="l01084"></a><span class="lineno"> 1084</span>&#160;    }</div>
+<div class="line"><a name="l01085"></a><span class="lineno"> 1085</span>&#160;  }</div>
+<div class="line"><a name="l01086"></a><span class="lineno"> 1086</span>&#160;</div>
+<div class="line"><a name="l01087"></a><span class="lineno"> 1087</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01088"></a><span class="lineno"> 1088</span>&#160;}</div>
+<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;</div>
+<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;H265Parser::Result H265Parser::SkipSubLayerHrdParameters(</div>
+<div class="line"><a name="l01091"></a><span class="lineno"> 1091</span>&#160;    <span class="keywordtype">int</span> cpb_cnt_minus1,</div>
+<div class="line"><a name="l01092"></a><span class="lineno"> 1092</span>&#160;    <span class="keywordtype">bool</span> sub_pic_hdr_params_present_flag,</div>
+<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;    H26xBitReader* br) {</div>
+<div class="line"><a name="l01094"></a><span class="lineno"> 1094</span>&#160;  <span class="keywordtype">int</span> ignored;</div>
+<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= cpb_cnt_minus1; i++) {</div>
+<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// bit_rate_value_minus1</span></div>
+<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;    TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// cpb_size_value_minus1</span></div>
+<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160;    <span class="keywordflow">if</span> (sub_pic_hdr_params_present_flag) {</div>
+<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// cpb_size_du_value_minus1</span></div>
+<div class="line"><a name="l01100"></a><span class="lineno"> 1100</span>&#160;      TRUE_OR_RETURN(br-&gt;ReadUE(&amp;ignored));  <span class="comment">// bit_rate_du_value_minus1</span></div>
+<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;    }</div>
+<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;</div>
+<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// cbr_flag</span></div>
+<div class="line"><a name="l01104"></a><span class="lineno"> 1104</span>&#160;  }</div>
+<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;</div>
+<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;}</div>
 <div class="line"><a name="l01108"></a><span class="lineno"> 1108</span>&#160;</div>
-<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;    TRUE_OR_RETURN(br-&gt;SkipBits(1));  <span class="comment">// cbr_flag</span></div>
-<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;  }</div>
-<div class="line"><a name="l01111"></a><span class="lineno"> 1111</span>&#160;</div>
-<div class="line"><a name="l01112"></a><span class="lineno"> 1112</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01113"></a><span class="lineno"> 1113</span>&#160;}</div>
-<div class="line"><a name="l01114"></a><span class="lineno"> 1114</span>&#160;</div>
-<div class="line"><a name="l01115"></a><span class="lineno"> 1115</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l01116"></a><span class="lineno"> 1116</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a6bcba03125313ea515a61a67c9d2a821"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a6bcba03125313ea515a61a67c9d2a821">shaka::media::Nalu::payload_size</a></div><div class="ttdeci">uint64_t payload_size() const </div><div class="ttdoc">Size of this Nalu minus header_size(). </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00101">nalu_reader.h:101</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265VuiParameters_html"><div class="ttname"><a href="../../d9/d67/structshaka_1_1media_1_1H265VuiParameters.html">shaka::media::H265VuiParameters</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00046">h265_parser.h:46</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265Pps_html"><div class="ttname"><a href="../../de/d33/structshaka_1_1media_1_1H265Pps.html">shaka::media::H265Pps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00060">h265_parser.h:60</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00187">h265_parser.cc:187</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ae94e80774a60cc7b9cfdb7503f5047fe"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ae94e80774a60cc7b9cfdb7503f5047fe">shaka::media::H265Parser::ParseSliceHeader</a></div><div class="ttdeci">Result ParseSliceHeader(const Nalu &amp;nalu, H265SliceHeader *slice_header)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00183">h265_parser.cc:183</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265Sps_html"><div class="ttname"><a href="../../d4/dfd/structshaka_1_1media_1_1H265Sps.html">shaka::media::H265Sps</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00121">h265_parser.h:121</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00404">h265_parser.cc:404</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a222c85ac46e908c8478304f2be769d6d"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a222c85ac46e908c8478304f2be769d6d">shaka::media::H265Parser::ParsePps</a></div><div class="ttdeci">Result ParsePps(const Nalu &amp;nalu, int *pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00400">h265_parser.cc:400</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a86143bb8a31825f06668e97bff66ce2c"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a86143bb8a31825f06668e97bff66ce2c">shaka::media::Nalu::type</a></div><div class="ttdeci">int type() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00112">nalu_reader.h:112</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a9eb982bdbb66c10643b2fb8e2ae7a9ae"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a9eb982bdbb66c10643b2fb8e2ae7a9ae">shaka::media::Nalu::header_size</a></div><div class="ttdeci">uint64_t header_size() const </div><div class="ttdoc">The size of the header, e.g. 1 for H.264. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00099">nalu_reader.h:99</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1H265SliceHeader_html"><div class="ttname"><a href="../../db/d05/structshaka_1_1media_1_1H265SliceHeader.html">shaka::media::H265SliceHeader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00206">h265_parser.h:206</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">shaka::media::Nalu</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00026">nalu_reader.h:26</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00634">h265_parser.cc:634</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_af4a103a131c849bf54018b747dbdd80c"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">shaka::media::H265Parser::GetPps</a></div><div class="ttdeci">const H265Pps * GetPps(int pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00630">h265_parser.cc:630</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00628">h265_parser.cc:628</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_af4a103a131c849bf54018b747dbdd80c"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#af4a103a131c849bf54018b747dbdd80c">shaka::media::H265Parser::GetPps</a></div><div class="ttdeci">const H265Pps * GetPps(int pps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00624">h265_parser.cc:624</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H26xBitReader_html"><div class="ttname"><a href="../../de/db4/classshaka_1_1media_1_1H26xBitReader.html">shaka::media::H26xBitReader</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/dc2/h26x__bit__reader_8h_source.html#l00022">h26x_bit_reader.h:22</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00513">h265_parser.cc:513</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00508">h265_parser.cc:508</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a3175755a2a847c3bfc8292434d4ea3b6"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">shaka::media::Nalu::data</a></div><div class="ttdeci">const uint8_t * data() const </div><div class="ttdoc">This is the pointer to the Nalu data, pointing to the header. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00096">nalu_reader.h:96</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dec/audio__timestamp__helper_8cc_source.html b/docs/db/dec/audio__timestamp__helper_8cc_source.html
index 9f665daed0..e5ee91cfa7 100644
--- a/docs/db/dec/audio__timestamp__helper_8cc_source.html
+++ b/docs/db/dec/audio__timestamp__helper_8cc_source.html
@@ -165,7 +165,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dee/pes__packet_8cc_source.html b/docs/db/dee/pes__packet_8cc_source.html
index b2d1789ac0..500bf46e21 100644
--- a/docs/db/dee/pes__packet_8cc_source.html
+++ b/docs/db/dee/pes__packet_8cc_source.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/df2/structshaka_1_1media_1_1H265SliceHeader-members.html b/docs/db/df2/structshaka_1_1media_1_1H265SliceHeader-members.html
index 9fcfa90271..069ea2bb9e 100644
--- a/docs/db/df2/structshaka_1_1media_1_1H265SliceHeader-members.html
+++ b/docs/db/df2/structshaka_1_1media_1_1H265SliceHeader-members.html
@@ -139,7 +139,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html b/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html
index 749ae4865a..c58c21d235 100644
--- a/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html
+++ b/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/df6/muxer_8h_source.html b/docs/db/df6/muxer_8h_source.html
index 00b3ee048b..764983dd1d 100644
--- a/docs/db/df6/muxer_8h_source.html
+++ b/docs/db/df6/muxer_8h_source.html
@@ -212,7 +212,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html b/docs/db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html
index fa63606ddb..00078e0684 100644
--- a/docs/db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html
+++ b/docs/db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html
@@ -171,7 +171,7 @@ static const size_t&#160;</td><td class="memItemRight" valign="bottom"><b>kUnitS
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dfb/mpd__utils_8cc_source.html b/docs/db/dfb/mpd__utils_8cc_source.html
index d2717aa068..d832ecfb68 100644
--- a/docs/db/dfb/mpd__utils_8cc_source.html
+++ b/docs/db/dfb/mpd__utils_8cc_source.html
@@ -437,14 +437,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;</div>
 <div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;</div>
 <div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
 <div class="ttc" id="namespaceshaka_html_abfd977a0dfb051a942d1694442692814"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">shaka::AddContentProtectionElements</a></div><div class="ttdeci">void AddContentProtectionElements(const MediaInfo &amp;media_info, Representation *parent)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dfb/mpd__utils_8cc_source.html#l00339">mpd_utils.cc:339</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a4c2ea2c3e7055657ca68a6b8e285d4d6"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a4c2ea2c3e7055657ca68a6b8e285d4d6">shaka::HexToUUID</a></div><div class="ttdeci">bool HexToUUID(const std::string &amp;data, std::string *uuid_format)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dfb/mpd__utils_8cc_source.html#l00174">mpd_utils.cc:174</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html b/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html
index 3adad95862..8f394a78c3 100644
--- a/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html
+++ b/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html
@@ -274,7 +274,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/db/dff/structshaka_1_1media_1_1mp4_1_1ChunkInfo-members.html b/docs/db/dff/structshaka_1_1media_1_1mp4_1_1ChunkInfo-members.html
index d0b5117f98..d6ff233e99 100644
--- a/docs/db/dff/structshaka_1_1media_1_1mp4_1_1ChunkInfo-members.html
+++ b/docs/db/dff/structshaka_1_1media_1_1mp4_1_1ChunkInfo-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d02/classshaka_1_1media_1_1IoCache-members.html b/docs/dc/d02/classshaka_1_1media_1_1IoCache-members.html
index 8ae8d90b23..65083f6c72 100644
--- a/docs/dc/d02/classshaka_1_1media_1_1IoCache-members.html
+++ b/docs/dc/d02/classshaka_1_1media_1_1IoCache-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html b/docs/dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html
index 4a66275cf7..0005f26d8f 100644
--- a/docs/dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html
+++ b/docs/dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html
@@ -138,7 +138,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>kElem
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d06/classshaka_1_1media_1_1StreamInfo-members.html b/docs/dc/d06/classshaka_1_1media_1_1StreamInfo-members.html
index ffd8fb4706..17194456ac 100644
--- a/docs/dc/d06/classshaka_1_1media_1_1StreamInfo-members.html
+++ b/docs/dc/d06/classshaka_1_1media_1_1StreamInfo-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d0b/classshaka_1_1media_1_1ESDescriptor-members.html b/docs/dc/d0b/classshaka_1_1media_1_1ESDescriptor-members.html
index 7945f915f4..9ee942926a 100644
--- a/docs/dc/d0b/classshaka_1_1media_1_1ESDescriptor-members.html
+++ b/docs/dc/d0b/classshaka_1_1media_1_1ESDescriptor-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d16/classshaka_1_1media_1_1SeekHead.html b/docs/dc/d16/classshaka_1_1media_1_1SeekHead.html
index 2a544f42a8..4741b2066b 100644
--- a/docs/dc/d16/classshaka_1_1media_1_1SeekHead.html
+++ b/docs/dc/d16/classshaka_1_1media_1_1SeekHead.html
@@ -148,7 +148,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_tracks_pos</b> (u
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html b/docs/dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html
index 4ce9e1a1bd..863ee05d6a 100644
--- a/docs/dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html
+++ b/docs/dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html
@@ -256,7 +256,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d18/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo-members.html b/docs/dc/d18/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo-members.html
index 686b5d2862..6a6b7f699b 100644
--- a/docs/dc/d18/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo-members.html
+++ b/docs/dc/d18/structshaka_1_1media_1_1mp4_1_1ProtectionSchemeInfo-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d19/box_8h_source.html b/docs/dc/d19/box_8h_source.html
index 69e5348615..a9dc10f9ea 100644
--- a/docs/dc/d19/box_8h_source.html
+++ b/docs/dc/d19/box_8h_source.html
@@ -184,7 +184,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html b/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html
index 5ace8a5a25..8e7c5758b3 100644
--- a/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html
+++ b/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html
@@ -95,306 +95,307 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/dash_iop_mpd_notifier.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_notifier_util.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_utils.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kStartingGroupId = 1;</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment">// The easiest way to check whether two protobufs are equal, is to compare the</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">// serialized version.</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keywordtype">bool</span> ProtectedContentEq(</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; content_protection1,</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; content_protection2) {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keywordflow">return</span> content_protection1.SerializeAsString() ==</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;         content_protection2.SerializeAsString();</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;}</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;std::set&lt;std::string&gt; GetUUIDs(</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; protected_content) {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  std::set&lt;std::string&gt; uuids;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; protected_content.content_protection_entry().size();</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;       ++i) {</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent::ContentProtectionEntry&amp; entry =</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;        protected_content.content_protection_entry(i);</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    uuids.insert(entry.uuid());</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  }</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordflow">return</span> uuids;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;}</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;DashIopMpdNotifier::DashIopMpdNotifier(</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    DashProfile dash_profile,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keyword">const</span> std::string&amp; output_path)</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    : MpdNotifier(dash_profile),</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;      output_path_(output_path),</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;      mpd_builder_(new MpdBuilder(dash_profile == kLiveProfile</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                                      ? MpdBuilder::kDynamic</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                      : MpdBuilder::kStatic,</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                                  mpd_options)),</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;      next_group_id_(kStartingGroupId) {</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  DCHECK(dash_profile == kLiveProfile || dash_profile == kOnDemandProfile);</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; base_urls.size(); ++i)</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    mpd_builder_-&gt;AddBaseUrl(base_urls[i]);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;}</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;DashIopMpdNotifier::~DashIopMpdNotifier() {}</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div>
-<div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">   61</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">DashIopMpdNotifier::Init</a>() {</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;}</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
-<div class="line"><a name="l00065"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">   65</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">DashIopMpdNotifier::NotifyNewContainer</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                                            uint32_t* container_id) {</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  DCHECK(container_id);</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  ContentType content_type = <a class="code" href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">GetContentType</a>(media_info);</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">if</span> (content_type == kContentTypeUnknown)</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keyword">const</span> std::string key = GetAdaptationSetKey(media_info);</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* adaptation_set = GetAdaptationSetForMediaInfo(key, media_info);</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  DCHECK(adaptation_set);</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">if</span> (media_info.has_text_info()) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="comment">// IOP requires all AdaptationSets to have (sub)segmentAlignment set to</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="comment">// true, so carelessly set it to true.</span></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="comment">// In practice it doesn&#39;t really make sense to adapt between text tracks.</span></div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    adaptation_set-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">ForceSetSegmentAlignment</a>(<span class="keyword">true</span>);</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  }</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  MediaInfo adjusted_media_info(media_info);</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(output_path_, &amp;adjusted_media_info);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* representation =</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      adaptation_set-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AddRepresentation</a>(adjusted_media_info);</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keywordflow">if</span> (!representation)</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  representation_id_to_adaptation_set_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = adaptation_set;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  SetGroupId(key, adaptation_set);</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  *container_id = representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>();</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  DCHECK(!ContainsKey(representation_map_, representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()));</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  representation_map_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = representation;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;}</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
-<div class="line"><a name="l00101"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">  101</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">DashIopMpdNotifier::NotifySampleDuration</a>(uint32_t container_id,</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                                              uint32_t sample_duration) {</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  }</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  it-&gt;second-&gt;SetSampleDuration(sample_duration);</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;}</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
-<div class="line"><a name="l00113"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">  113</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">DashIopMpdNotifier::NotifyNewSegment</a>(uint32_t container_id,</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;                                          uint64_t start_time,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                          uint64_t duration,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                          uint64_t size) {</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  }</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  it-&gt;second-&gt;AddNewSegment(start_time, duration, size);</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;}</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
-<div class="line"><a name="l00127"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">  127</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">DashIopMpdNotifier::NotifyEncryptionUpdate</a>(</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;    uint32_t container_id,</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    <span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_key_id,</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_pssh) {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  }</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* adaptation_set_for_representation =</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;      representation_id_to_adaptation_set_[it-&gt;second-&gt;id()];</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  adaptation_set_for_representation-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">UpdateContentProtectionPssh</a>(</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;      drm_uuid, <a class="code" href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">Uint8VectorToBase64</a>(new_pssh));</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;}</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
-<div class="line"><a name="l00146"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">  146</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">DashIopMpdNotifier::AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    uint32_t container_id,</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="comment">// Intentionally not implemented because if a Representation gets a new</span></div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="comment">// &lt;ContentProtection&gt; element, then it might require moving the</span></div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="comment">// Representation out of the AdaptationSet. There&#39;s no logic to do that</span></div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  <span class="comment">// yet.</span></div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;}</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
-<div class="line"><a name="l00156"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">  156</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">DashIopMpdNotifier::Flush</a>() {</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  base::AutoLock auto_lock(lock_);</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">WriteMpdToFile</a>(output_path_, mpd_builder_.get());</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;}</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* DashIopMpdNotifier::GetAdaptationSetForMediaInfo(</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keyword">const</span> std::string&amp; key,</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  std::list&lt;AdaptationSet*&gt;&amp; adaptation_sets = adaptation_set_list_map_[key];</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="keywordflow">if</span> (adaptation_sets.empty())</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;    <span class="keywordflow">return</span> NewAdaptationSet(media_info, &amp;adaptation_sets);</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_protected_content = media_info.has_protected_content();</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;AdaptationSet*&gt;::const_iterator adaptation_set_it =</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;           adaptation_sets.begin();</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;       adaptation_set_it != adaptation_sets.end(); ++adaptation_set_it) {</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    ProtectedContentMap::const_iterator protected_content_it =</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;        protected_content_map_.find((*adaptation_set_it)-&gt;id());</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    <span class="comment">// If the AdaptationSet ID is not registered in the map, then it is clear</span></div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    <span class="comment">// content (or encrypted but doesn&#39;t need &lt;ContentProtection&gt; element</span></div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    <span class="comment">// possibly because the player knows how to handle it).</span></div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    <span class="keywordflow">if</span> (protected_content_it == protected_content_map_.end()) {</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;      <span class="comment">// Can reuse the AdaptationSet without content protection.</span></div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;      <span class="keywordflow">if</span> (!has_protected_content)</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;        <span class="keywordflow">return</span> *adaptation_set_it;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    }</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    <span class="keywordflow">if</span> (ProtectedContentEq(protected_content_it-&gt;second,</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;                           media_info.protected_content())) {</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      <span class="comment">// Content protection info matches. Reuse the AdaptationSet.</span></div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;      <span class="keywordflow">return</span> *adaptation_set_it;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    }</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  }</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="comment">// None of the adaptation sets match with the new content protection.</span></div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="comment">// Need a new one.</span></div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="keywordflow">return</span> NewAdaptationSet(media_info, &amp;adaptation_sets);</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;}</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;<span class="comment">// Get all the UUIDs of the AdaptationSet. If another AdaptationSet has the</span></div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;<span class="comment">// same UUIDs then those should be groupable.</span></div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;<span class="keywordtype">void</span> DashIopMpdNotifier::SetGroupId(<span class="keyword">const</span> std::string&amp; key,</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;                                    AdaptationSet* adaptation_set) {</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="keywordflow">if</span> (adaptation_set-&gt;Group() &gt;= 0)  <span class="comment">// @group already assigned.</span></div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  ProtectedContentMap::const_iterator protected_content_it =</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;      protected_content_map_.find(adaptation_set-&gt;id());</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="comment">// Clear contents should be in one AdaptationSet, so no need to assign</span></div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="comment">// @group.</span></div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <span class="keywordflow">if</span> (protected_content_it == protected_content_map_.end()) {</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;No content protection set for AdaptationSet@id=&quot;</span></div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;             &lt;&lt; adaptation_set-&gt;id();</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  }</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="comment">// Get all the UUIDs of the ContentProtections in AdaptationSet.</span></div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  std::set&lt;std::string&gt; adaptation_set_uuids =</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;      GetUUIDs(protected_content_it-&gt;second);</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  std::list&lt;AdaptationSet*&gt;&amp; same_type_adapatation_sets =</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;      adaptation_set_list_map_[key];</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  DCHECK(!same_type_adapatation_sets.empty())</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;same_type_adapatation_sets should not be null, it should at least &quot;</span></div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;         <span class="stringliteral">&quot;contain adaptation_set&quot;</span>;</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;AdaptationSet*&gt;::iterator adaptation_set_it =</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;           same_type_adapatation_sets.begin();</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;       adaptation_set_it != same_type_adapatation_sets.end();</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;       ++adaptation_set_it) {</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    <span class="keyword">const</span> uint32_t loop_adaptation_set_id = (*adaptation_set_it)-&gt;id();</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="keywordflow">if</span> (loop_adaptation_set_id == adaptation_set-&gt;id() ||</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;        !ContainsKey(protected_content_map_, loop_adaptation_set_id)) {</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    }</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; loop_protected_content =</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;        protected_content_map_[loop_adaptation_set_id];</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="keywordflow">if</span> (static_cast&lt;int&gt;(adaptation_set_uuids.size()) !=</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;        loop_protected_content.content_protection_entry().size()) {</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;      <span class="comment">// Different number of UUIDs, cannot be grouped.</span></div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;      <span class="keywordflow">continue</span>;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    }</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="keywordflow">if</span> (adaptation_set_uuids == GetUUIDs(loop_protected_content)) {</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;      AdaptationSet&amp; uuid_match_adaptation_set = **adaptation_set_it;</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;      <span class="comment">// They match. These AdaptationSets can be in the same group. Break out.</span></div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;      <span class="keywordflow">if</span> (uuid_match_adaptation_set.Group() &gt;= 0) {</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;        adaptation_set-&gt;SetGroup(uuid_match_adaptation_set.Group());</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span> group_id = next_group_id_++;</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;        uuid_match_adaptation_set.SetGroup(group_id);</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;        adaptation_set-&gt;SetGroup(group_id);</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;      }</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;    }</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  }</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;}</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;AdaptationSet* DashIopMpdNotifier::NewAdaptationSet(</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;    std::list&lt;AdaptationSet*&gt;* adaptation_sets) {</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  std::string language = GetLanguage(media_info);</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  AdaptationSet* new_adaptation_set = mpd_builder_-&gt;AddAdaptationSet(language);</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="keywordflow">if</span> (media_info.has_protected_content()) {</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    DCHECK(!ContainsKey(protected_content_map_, new_adaptation_set-&gt;id()));</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    protected_content_map_[new_adaptation_set-&gt;id()] =</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;        media_info.protected_content();</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;    <a class="code" href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">AddContentProtectionElements</a>(media_info, new_adaptation_set);</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;  }</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;  adaptation_sets-&gt;push_back(new_adaptation_set);</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;    <span class="comment">// Because &#39;lang&#39; is ignored for videos, |adaptation_sets| must have</span></div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;    <span class="comment">// all the video AdaptationSets.</span></div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;    <span class="keywordflow">if</span> (adaptation_sets-&gt;size() &gt; 2) {</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;      new_adaptation_set-&gt;AddRole(AdaptationSet::kRoleMain);</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (adaptation_sets-&gt;size() == 2) {</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;      <span class="comment">// Set &quot;main&quot; Role for both AdaptatoinSets.</span></div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;      (*adaptation_sets-&gt;begin())-&gt;AddRole(AdaptationSet::kRoleMain);</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;      new_adaptation_set-&gt;AddRole(AdaptationSet::kRoleMain);</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;    }</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;  }</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;  <span class="keywordflow">return</span> new_adaptation_set;</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;}</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ab3411eb75eedce9a26f0767210280e71"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">shaka::DashIopMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00156">dash_iop_mpd_notifier.cc:156</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ad2561d25eb7ace9b919ef8b96d4a06a7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">shaka::DashIopMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00113">dash_iop_mpd_notifier.cc:113</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a093eac08e6fdc396e6bbcbc58d35a3c3"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">shaka::DashIopMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00127">dash_iop_mpd_notifier.cc:127</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00693">mpd_builder.cc:693</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00503">mpd_builder.h:503</a></div></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_notifier_util.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_utils.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">const</span> <span class="keywordtype">int</span> kStartingGroupId = 1;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">// The easiest way to check whether two protobufs are equal, is to compare the</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">// serialized version.</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keywordtype">bool</span> ProtectedContentEq(</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; content_protection1,</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; content_protection2) {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  <span class="keywordflow">return</span> content_protection1.SerializeAsString() ==</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;         content_protection2.SerializeAsString();</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;}</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;std::set&lt;std::string&gt; GetUUIDs(</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; protected_content) {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  std::set&lt;std::string&gt; uuids;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; protected_content.content_protection_entry().size();</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;       ++i) {</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent::ContentProtectionEntry&amp; entry =</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;        protected_content.content_protection_entry(i);</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    uuids.insert(entry.uuid());</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  }</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordflow">return</span> uuids;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;}</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;DashIopMpdNotifier::DashIopMpdNotifier(</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    DashProfile dash_profile,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">const</span> std::string&amp; output_path)</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    : MpdNotifier(dash_profile),</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;      output_path_(output_path),</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;      mpd_builder_(new MpdBuilder(dash_profile == kLiveProfile</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                      ? MpdBuilder::kDynamic</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                                      : MpdBuilder::kStatic,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                                  mpd_options)),</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;      next_group_id_(kStartingGroupId) {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  DCHECK(dash_profile == kLiveProfile || dash_profile == kOnDemandProfile);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; base_urls.size(); ++i)</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    mpd_builder_-&gt;AddBaseUrl(base_urls[i]);</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;}</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;DashIopMpdNotifier::~DashIopMpdNotifier() {}</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
+<div class="line"><a name="l00062"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">   62</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">DashIopMpdNotifier::Init</a>() {</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;}</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
+<div class="line"><a name="l00066"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">   66</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">DashIopMpdNotifier::NotifyNewContainer</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                                            uint32_t* container_id) {</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  DCHECK(container_id);</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  ContentType content_type = <a class="code" href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">GetContentType</a>(media_info);</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">if</span> (content_type == kContentTypeUnknown)</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keyword">const</span> std::string key = GetAdaptationSetKey(media_info);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* adaptation_set = GetAdaptationSetForMediaInfo(key, media_info);</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  DCHECK(adaptation_set);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordflow">if</span> (media_info.has_text_info()) {</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="comment">// IOP requires all AdaptationSets to have (sub)segmentAlignment set to</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="comment">// true, so carelessly set it to true.</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="comment">// In practice it doesn&#39;t really make sense to adapt between text tracks.</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    adaptation_set-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">ForceSetSegmentAlignment</a>(<span class="keyword">true</span>);</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  }</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  MediaInfo adjusted_media_info(media_info);</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(output_path_, &amp;adjusted_media_info);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* representation =</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      adaptation_set-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AddRepresentation</a>(adjusted_media_info);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keywordflow">if</span> (!representation)</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  representation_id_to_adaptation_set_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = adaptation_set;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  SetGroupId(key, adaptation_set);</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  *container_id = representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>();</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  DCHECK(!ContainsKey(representation_map_, representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()));</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  representation_map_[representation-&gt;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a>()] = representation;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;}</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div>
+<div class="line"><a name="l00102"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">  102</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">DashIopMpdNotifier::NotifySampleDuration</a>(uint32_t container_id,</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;                                              uint32_t sample_duration) {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  }</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  it-&gt;second-&gt;SetSampleDuration(sample_duration);</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;}</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
+<div class="line"><a name="l00114"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">  114</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">DashIopMpdNotifier::NotifyNewSegment</a>(uint32_t container_id,</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                          uint64_t start_time,</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                          uint64_t duration,</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;                                          uint64_t size) {</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  }</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  it-&gt;second-&gt;AddNewSegment(start_time, duration, size);</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
+<div class="line"><a name="l00128"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">  128</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">DashIopMpdNotifier::NotifyEncryptionUpdate</a>(</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    uint32_t container_id,</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_key_id,</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; new_pssh) {</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  RepresentationMap::iterator it = representation_map_.find(container_id);</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  <span class="keywordflow">if</span> (it == representation_map_.end()) {</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected container_id: &quot;</span> &lt;&lt; container_id;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  }</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* adaptation_set_for_representation =</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;      representation_id_to_adaptation_set_[it-&gt;second-&gt;id()];</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  adaptation_set_for_representation-&gt;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">UpdateContentProtectionPssh</a>(</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;      drm_uuid, <a class="code" href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">Uint8VectorToBase64</a>(new_pssh));</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;}</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;</div>
+<div class="line"><a name="l00147"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">  147</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">DashIopMpdNotifier::AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    uint32_t container_id,</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="comment">// Intentionally not implemented because if a Representation gets a new</span></div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="comment">// &lt;ContentProtection&gt; element, then it might require moving the</span></div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  <span class="comment">// Representation out of the AdaptationSet. There&#39;s no logic to do that</span></div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  <span class="comment">// yet.</span></div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;}</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
+<div class="line"><a name="l00157"></a><span class="lineno"><a class="line" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">  157</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">DashIopMpdNotifier::Flush</a>() {</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  base::AutoLock auto_lock(lock_);</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">WriteMpdToFile</a>(output_path_, mpd_builder_.get());</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;}</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* DashIopMpdNotifier::GetAdaptationSetForMediaInfo(</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;    <span class="keyword">const</span> std::string&amp; key,</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  std::list&lt;AdaptationSet*&gt;&amp; adaptation_sets = adaptation_set_list_map_[key];</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordflow">if</span> (adaptation_sets.empty())</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="keywordflow">return</span> NewAdaptationSet(media_info, &amp;adaptation_sets);</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_protected_content = media_info.has_protected_content();</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;AdaptationSet*&gt;::const_iterator adaptation_set_it =</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;           adaptation_sets.begin();</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;       adaptation_set_it != adaptation_sets.end(); ++adaptation_set_it) {</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    ProtectedContentMap::const_iterator protected_content_it =</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;        protected_content_map_.find((*adaptation_set_it)-&gt;id());</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    <span class="comment">// If the AdaptationSet ID is not registered in the map, then it is clear</span></div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    <span class="comment">// content (or encrypted but doesn&#39;t need &lt;ContentProtection&gt; element</span></div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    <span class="comment">// possibly because the player knows how to handle it).</span></div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">if</span> (protected_content_it == protected_content_map_.end()) {</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;      <span class="comment">// Can reuse the AdaptationSet without content protection.</span></div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;      <span class="keywordflow">if</span> (!has_protected_content)</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;        <span class="keywordflow">return</span> *adaptation_set_it;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    }</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">if</span> (ProtectedContentEq(protected_content_it-&gt;second,</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;                           media_info.protected_content())) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;      <span class="comment">// Content protection info matches. Reuse the AdaptationSet.</span></div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;      <span class="keywordflow">return</span> *adaptation_set_it;</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    }</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  }</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  <span class="comment">// None of the adaptation sets match with the new content protection.</span></div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="comment">// Need a new one.</span></div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="keywordflow">return</span> NewAdaptationSet(media_info, &amp;adaptation_sets);</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;}</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;<span class="comment">// Get all the UUIDs of the AdaptationSet. If another AdaptationSet has the</span></div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;<span class="comment">// same UUIDs then those should be groupable.</span></div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;<span class="keywordtype">void</span> DashIopMpdNotifier::SetGroupId(<span class="keyword">const</span> std::string&amp; key,</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;                                    AdaptationSet* adaptation_set) {</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <span class="keywordflow">if</span> (adaptation_set-&gt;Group() &gt;= 0)  <span class="comment">// @group already assigned.</span></div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  ProtectedContentMap::const_iterator protected_content_it =</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;      protected_content_map_.find(adaptation_set-&gt;id());</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="comment">// Clear contents should be in one AdaptationSet, so no need to assign</span></div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <span class="comment">// @group.</span></div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  <span class="keywordflow">if</span> (protected_content_it == protected_content_map_.end()) {</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;No content protection set for AdaptationSet@id=&quot;</span></div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;             &lt;&lt; adaptation_set-&gt;id();</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  }</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="comment">// Get all the UUIDs of the ContentProtections in AdaptationSet.</span></div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;  std::set&lt;std::string&gt; adaptation_set_uuids =</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;      GetUUIDs(protected_content_it-&gt;second);</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  std::list&lt;AdaptationSet*&gt;&amp; same_type_adapatation_sets =</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;      adaptation_set_list_map_[key];</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  DCHECK(!same_type_adapatation_sets.empty())</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;same_type_adapatation_sets should not be null, it should at least &quot;</span></div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;         <span class="stringliteral">&quot;contain adaptation_set&quot;</span>;</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;AdaptationSet*&gt;::iterator adaptation_set_it =</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;           same_type_adapatation_sets.begin();</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;       adaptation_set_it != same_type_adapatation_sets.end();</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;       ++adaptation_set_it) {</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="keyword">const</span> uint32_t loop_adaptation_set_id = (*adaptation_set_it)-&gt;id();</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <span class="keywordflow">if</span> (loop_adaptation_set_id == adaptation_set-&gt;id() ||</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;        !ContainsKey(protected_content_map_, loop_adaptation_set_id)) {</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    }</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keyword">const</span> MediaInfo::ProtectedContent&amp; loop_protected_content =</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;        protected_content_map_[loop_adaptation_set_id];</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordflow">if</span> (static_cast&lt;int&gt;(adaptation_set_uuids.size()) !=</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;        loop_protected_content.content_protection_entry().size()) {</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;      <span class="comment">// Different number of UUIDs, cannot be grouped.</span></div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;      <span class="keywordflow">continue</span>;</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    }</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keywordflow">if</span> (adaptation_set_uuids == GetUUIDs(loop_protected_content)) {</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;      AdaptationSet&amp; uuid_match_adaptation_set = **adaptation_set_it;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;      <span class="comment">// They match. These AdaptationSets can be in the same group. Break out.</span></div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;      <span class="keywordflow">if</span> (uuid_match_adaptation_set.Group() &gt;= 0) {</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;        adaptation_set-&gt;SetGroup(uuid_match_adaptation_set.Group());</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span> group_id = next_group_id_++;</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;        uuid_match_adaptation_set.SetGroup(group_id);</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;        adaptation_set-&gt;SetGroup(group_id);</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;      }</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    }</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;  }</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;}</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;AdaptationSet* DashIopMpdNotifier::NewAdaptationSet(</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    std::list&lt;AdaptationSet*&gt;* adaptation_sets) {</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  std::string language = GetLanguage(media_info);</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  AdaptationSet* new_adaptation_set = mpd_builder_-&gt;AddAdaptationSet(language);</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;  <span class="keywordflow">if</span> (media_info.has_protected_content()) {</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    DCHECK(!ContainsKey(protected_content_map_, new_adaptation_set-&gt;id()));</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;    protected_content_map_[new_adaptation_set-&gt;id()] =</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;        media_info.protected_content();</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    <a class="code" href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">AddContentProtectionElements</a>(media_info, new_adaptation_set);</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;  }</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;  adaptation_sets-&gt;push_back(new_adaptation_set);</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;    <span class="comment">// Because &#39;lang&#39; is ignored for videos, |adaptation_sets| must have</span></div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;    <span class="comment">// all the video AdaptationSets.</span></div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;    <span class="keywordflow">if</span> (adaptation_sets-&gt;size() &gt; 2) {</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;      new_adaptation_set-&gt;AddRole(AdaptationSet::kRoleMain);</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (adaptation_sets-&gt;size() == 2) {</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;      <span class="comment">// Set &quot;main&quot; Role for both AdaptatoinSets.</span></div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;      (*adaptation_sets-&gt;begin())-&gt;AddRole(AdaptationSet::kRoleMain);</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;      new_adaptation_set-&gt;AddRole(AdaptationSet::kRoleMain);</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;    }</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;  }</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;  <span class="keywordflow">return</span> new_adaptation_set;</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;}</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ab3411eb75eedce9a26f0767210280e71"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ab3411eb75eedce9a26f0767210280e71">shaka::DashIopMpdNotifier::Flush</a></div><div class="ttdeci">bool Flush() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00157">dash_iop_mpd_notifier.cc:157</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_ad2561d25eb7ace9b919ef8b96d4a06a7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#ad2561d25eb7ace9b919ef8b96d4a06a7">shaka::DashIopMpdNotifier::NotifyNewSegment</a></div><div class="ttdeci">bool NotifyNewSegment(uint32_t id, uint64_t start_time, uint64_t duration, uint64_t size) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00114">dash_iop_mpd_notifier.cc:114</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a093eac08e6fdc396e6bbcbc58d35a3c3"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a093eac08e6fdc396e6bbcbc58d35a3c3">shaka::DashIopMpdNotifier::NotifyEncryptionUpdate</a></div><div class="ttdeci">bool NotifyEncryptionUpdate(uint32_t container_id, const std::string &amp;drm_uuid, const std::vector&lt; uint8_t &gt; &amp;new_key_id, const std::vector&lt; uint8_t &gt; &amp;new_pssh) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00128">dash_iop_mpd_notifier.cc:128</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00689">mpd_builder.cc:689</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6a3ba385179698e57a1451d1a26ad827"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">shaka::Representation::id</a></div><div class="ttdeci">uint32_t id() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00500">mpd_builder.h:500</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9ec74194872324aad3838f1047fdbe13"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">shaka::DashIopMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00101">dash_iop_mpd_notifier.cc:101</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9ec74194872324aad3838f1047fdbe13"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9ec74194872324aad3838f1047fdbe13">shaka::DashIopMpdNotifier::NotifySampleDuration</a></div><div class="ttdeci">bool NotifySampleDuration(uint32_t container_id, uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00102">dash_iop_mpd_notifier.cc:102</a></div></div>
 <div class="ttc" id="namespaceshaka_html_abfd977a0dfb051a942d1694442692814"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#abfd977a0dfb051a942d1694442692814">shaka::AddContentProtectionElements</a></div><div class="ttdeci">void AddContentProtectionElements(const MediaInfo &amp;media_info, Representation *parent)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dfb/mpd__utils_8cc_source.html#l00339">mpd_utils.cc:339</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00743">mpd_builder.cc:743</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00739">mpd_builder.cc:739</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a4c7f8f964fec2bb9543e7ee8da9cd994"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a4c7f8f964fec2bb9543e7ee8da9cd994">shaka::Uint8VectorToBase64</a></div><div class="ttdeci">std::string Uint8VectorToBase64(const std::vector&lt; uint8_t &gt; &amp;input)</div><div class="ttdoc">Converts uint8 vector into base64 encoded string. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00068">mpd_notifier_util.cc:68</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00836">mpd_builder.cc:836</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a6afc2b87efd66cb12f75f5e519e0888d"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">shaka::DashIopMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00146">dash_iop_mpd_notifier.cc:146</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00646">mpd_builder.cc:646</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00833">mpd_builder.cc:833</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a6afc2b87efd66cb12f75f5e519e0888d"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a6afc2b87efd66cb12f75f5e519e0888d">shaka::DashIopMpdNotifier::AddContentProtectionElement</a></div><div class="ttdeci">bool AddContentProtectionElement(uint32_t id, const ContentProtectionElement &amp;content_protection_element) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00147">dash_iop_mpd_notifier.cc:147</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00643">mpd_builder.cc:643</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a5ea880937da26d677ff6a48c0219d090"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090">shaka::GetContentType</a></div><div class="ttdeci">ContentType GetContentType(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00051">mpd_notifier_util.cc:51</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9dd9d655a538ff2618634ca1f9809478"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">shaka::DashIopMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00061">dash_iop_mpd_notifier.cc:61</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_a9dd9d655a538ff2618634ca1f9809478"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478">shaka::DashIopMpdNotifier::Init</a></div><div class="ttdeci">bool Init() override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00062">dash_iop_mpd_notifier.cc:62</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a7e940cda37fa0dbefef3b3cc9c802ab8"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a7e940cda37fa0dbefef3b3cc9c802ab8">shaka::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(const std::string &amp;output_path, MpdBuilder *mpd_builder)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d2e/mpd__notifier__util_8cc_source.html#l00020">mpd_notifier_util.cc:20</a></div></div>
-<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_af86163b8fc680ea659e6ba2d2c5d6db7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">shaka::DashIopMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00065">dash_iop_mpd_notifier.cc:65</a></div></div>
+<div class="ttc" id="classshaka_1_1DashIopMpdNotifier_html_af86163b8fc680ea659e6ba2d2c5d6db7"><div class="ttname"><a href="../../d4/d70/classshaka_1_1DashIopMpdNotifier.html#af86163b8fc680ea659e6ba2d2c5d6db7">shaka::DashIopMpdNotifier::NotifyNewContainer</a></div><div class="ttdeci">bool NotifyNewContainer(const MediaInfo &amp;media_info, uint32_t *id) override</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d22/dash__iop__mpd__notifier_8cc_source.html#l00066">dash_iop_mpd_notifier.cc:66</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d3b/fixed__key__encryption__flags_8cc_source.html b/docs/dc/d3b/fixed__key__encryption__flags_8cc_source.html
index 4fbf530958..21b6f453a1 100644
--- a/docs/dc/d3b/fixed__key__encryption__flags_8cc_source.html
+++ b/docs/dc/d3b/fixed__key__encryption__flags_8cc_source.html
@@ -166,7 +166,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d3c/webm__cluster__parser_8h_source.html b/docs/dc/d3c/webm__cluster__parser_8h_source.html
index 00ab91d94b..80cdddfca6 100644
--- a/docs/dc/d3c/webm__cluster__parser_8h_source.html
+++ b/docs/dc/d3c/webm__cluster__parser_8h_source.html
@@ -301,7 +301,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d3f/key__source_8h_source.html b/docs/dc/d3f/key__source_8h_source.html
index f58cf42ad9..ee75ad68fd 100644
--- a/docs/dc/d3f/key__source_8h_source.html
+++ b/docs/dc/d3f/key__source_8h_source.html
@@ -168,7 +168,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d40/classshaka_1_1xml_1_1XmlNode-members.html b/docs/dc/d40/classshaka_1_1xml_1_1XmlNode-members.html
index f3c80549d0..f7154fb99b 100644
--- a/docs/dc/d40/classshaka_1_1xml_1_1XmlNode-members.html
+++ b/docs/dc/d40/classshaka_1_1xml_1_1XmlNode-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d41/classshaka_1_1media_1_1BufferWriter.html b/docs/dc/d41/classshaka_1_1media_1_1BufferWriter.html
index 6152fb8330..0a83dd03d0 100644
--- a/docs/dc/d41/classshaka_1_1media_1_1BufferWriter.html
+++ b/docs/dc/d41/classshaka_1_1media_1_1BufferWriter.html
@@ -301,7 +301,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>AppendInt</b> (int64_
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d4a/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader-members.html b/docs/dc/d4a/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader-members.html
index 17433c229d..0929624761 100644
--- a/docs/dc/d4a/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader-members.html
+++ b/docs/dc/d4a/structshaka_1_1media_1_1mp4_1_1ProtectionSystemSpecificHeader-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d4f/structshaka_1_1media_1_1mp4_1_1TrackHeader-members.html b/docs/dc/d4f/structshaka_1_1media_1_1mp4_1_1TrackHeader-members.html
index e3086a0061..262298dfdf 100644
--- a/docs/dc/d4f/structshaka_1_1media_1_1mp4_1_1TrackHeader-members.html
+++ b/docs/dc/d4f/structshaka_1_1media_1_1mp4_1_1TrackHeader-members.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d51/h265__byte__to__unit__stream__converter_8cc_source.html b/docs/dc/d51/h265__byte__to__unit__stream__converter_8cc_source.html
index 6ed669543c..cf3e12dd3e 100644
--- a/docs/dc/d51/h265__byte__to__unit__stream__converter_8cc_source.html
+++ b/docs/dc/d51/h265__byte__to__unit__stream__converter_8cc_source.html
@@ -219,14 +219,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1BufferWriter_html_abd8854feedd8b45146eb04dacf7d5b2f"><div class="ttname"><a href="../../dc/d41/classshaka_1_1media_1_1BufferWriter.html#abd8854feedd8b45146eb04dacf7d5b2f">shaka::media::BufferWriter::AppendInt</a></div><div class="ttdeci">void AppendInt(uint8_t v)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/dd3/buffer__writer_8cc_source.html#l00025">buffer_writer.cc:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1BufferWriter_html"><div class="ttname"><a href="../../dc/d41/classshaka_1_1media_1_1BufferWriter.html">shaka::media::BufferWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/dd2/buffer__writer_8h_source.html#l00022">buffer_writer.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html">shaka::media::Nalu</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00026">nalu_reader.h:26</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00634">h265_parser.cc:634</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_ab917855df00b9003c6be4612e2fe0211"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#ab917855df00b9003c6be4612e2fe0211">shaka::media::H265Parser::GetSps</a></div><div class="ttdeci">const H265Sps * GetSps(int sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00628">h265_parser.cc:628</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1H265Parser_html"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html">shaka::media::H265Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d24/h265__parser_8h_source.html#l00277">h265_parser.h:277</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00513">h265_parser.cc:513</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1H265Parser_html_a142cb83465f0fed7dba0da8e165b68fc"><div class="ttname"><a href="../../de/dc2/classshaka_1_1media_1_1H265Parser.html#a142cb83465f0fed7dba0da8e165b68fc">shaka::media::H265Parser::ParseSps</a></div><div class="ttdeci">Result ParseSps(const Nalu &amp;nalu, int *sps_id)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/dde/h265__parser_8cc_source.html#l00508">h265_parser.cc:508</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Nalu_html_a3175755a2a847c3bfc8292434d4ea3b6"><div class="ttname"><a href="../../d6/dff/classshaka_1_1media_1_1Nalu.html#a3175755a2a847c3bfc8292434d4ea3b6">shaka::media::Nalu::data</a></div><div class="ttdeci">const uint8_t * data() const </div><div class="ttdoc">This is the pointer to the Nalu data, pointing to the header. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/d87/nalu__reader_8h_source.html#l00096">nalu_reader.h:96</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d52/decoding__time__iterator_8h_source.html b/docs/dc/d52/decoding__time__iterator_8h_source.html
index 9f5647d2a0..1fbb5cc97c 100644
--- a/docs/dc/d52/decoding__time__iterator_8h_source.html
+++ b/docs/dc/d52/decoding__time__iterator_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d53/webm_2segmenter_8cc_source.html b/docs/dc/d53/webm_2segmenter_8cc_source.html
index def8250b3a..8f38f4a315 100644
--- a/docs/dc/d53/webm_2segmenter_8cc_source.html
+++ b/docs/dc/d53/webm_2segmenter_8cc_source.html
@@ -531,13 +531,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">shaka::media::StreamInfo</a></div><div class="ttdoc">Abstract class holds stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/daa/stream__info_8h_source.html#l00053">stream_info.h:53</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_acb335182d4bd226c1f044cc83705f4fc"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#acb335182d4bd226c1f044cc83705f4fc">shaka::media::MuxerOptions::fragment_sap_aligned</a></div><div class="ttdeci">bool fragment_sap_aligned</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00043">muxer_options.h:43</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a0440c751fd818964397d17330acc7afc"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">shaka::media::mp4::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const std::vector&lt; MediaStream * &gt; &amp;streams, MuxerListener *muxer_listener, ProgressListener *progress_listener, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00166">segmenter.cc:166</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00389">segmenter.cc:389</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a0440c751fd818964397d17330acc7afc"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">shaka::media::mp4::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const std::vector&lt; MediaStream * &gt; &amp;streams, MuxerListener *muxer_listener, ProgressListener *progress_listener, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00165">segmenter.cc:165</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00387">segmenter.cc:387</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_ad54aef6c349082d996a436ebea11eff2"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#ad54aef6c349082d996a436ebea11eff2">shaka::media::MuxerListener::OnSampleDurationReady</a></div><div class="ttdeci">virtual void OnSampleDurationReady(uint32_t sample_duration)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VPCodecConfigurationRecord_html"><div class="ttname"><a href="../../d1/da5/classshaka_1_1media_1_1VPCodecConfigurationRecord.html">shaka::media::VPCodecConfigurationRecord</a></div><div class="ttdoc">Class for parsing or writing VP codec configuration record. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d9b/vp__codec__configuration__record_8h_source.html#l00021">vp_codec_configuration_record.h:21</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_a897463091f0effa647a8e2822f48b2ee"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a897463091f0effa647a8e2822f48b2ee">shaka::media::MuxerListener::OnEncryptionStart</a></div><div class="ttdeci">virtual void OnEncryptionStart()=0</div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a1f1336e9be8b12733fe28da083eaf93f"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a1f1336e9be8b12733fe28da083eaf93f">shaka::media::MuxerOptions::segment_sap_aligned</a></div><div class="ttdeci">bool segment_sap_aligned</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00038">muxer_options.h:38</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a4a1a9e50050e75584ff1087aa318096a"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">shaka::media::mp4::Segmenter::AddSample</a></div><div class="ttdeci">Status AddSample(const MediaStream *stream, scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00322">segmenter.cc:322</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a4a1a9e50050e75584ff1087aa318096a"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">shaka::media::mp4::Segmenter::AddSample</a></div><div class="ttdeci">Status AddSample(const MediaStream *stream, scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00320">segmenter.cc:320</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_ae420a97a606ef54be16beb49e42cd135"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#ae420a97a606ef54be16beb49e42cd135">shaka::media::VideoStreamInfo::pixel_height</a></div><div class="ttdeci">uint32_t pixel_height() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00042">video_stream_info.h:42</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProgressListener_html"><div class="ttname"><a href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">shaka::media::ProgressListener</a></div><div class="ttdoc">This class listens to progress updates events. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d9d/progress__listener_8h_source.html#l00020">progress_listener.h:20</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html_a468dcd83a7c087cc83e755703488e92b"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a468dcd83a7c087cc83e755703488e92b">shaka::media::MkvWriter::Position</a></div><div class="ttdeci">mkvmuxer::int64 Position() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/dc8/mkv__writer_8cc_source.html#l00071">mkv_writer.cc:71</a></div></div>
@@ -551,13 +551,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a4e98ad5fc7bbc2df0cb95df3f1db9687"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a4e98ad5fc7bbc2df0cb95df3f1db9687">shaka::media::MuxerOptions::segment_duration</a></div><div class="ttdeci">double segment_duration</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00030">muxer_options.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a7283c64cb63a94264ff8fe405b8ce5c2"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter::GetDuration</a></div><div class="ttdeci">double GetDuration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00380">segmenter.cc:380</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a7283c64cb63a94264ff8fe405b8ce5c2"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter::GetDuration</a></div><div class="ttdeci">double GetDuration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00378">segmenter.cc:378</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">shaka::media::VideoStreamInfo</a></div><div class="ttdoc">Holds video stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d87/video__stream__info_8h_source.html#l00016">video_stream_info.h:16</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">shaka::media::MuxerListener</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dfa/muxer__listener_8h_source.html#l00030">muxer_listener.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html b/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html
index 5a69e29875..ded63d7a34 100644
--- a/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html
+++ b/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html
@@ -114,14 +114,14 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>max_long_term_frame_id
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00135">135</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00136">136</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d58/webm__media__parser_8h_source.html b/docs/dc/d58/webm__media__parser_8h_source.html
index f581256e65..08d0b46da2 100644
--- a/docs/dc/d58/webm__media__parser_8h_source.html
+++ b/docs/dc/d58/webm__media__parser_8h_source.html
@@ -179,7 +179,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d5c/classshaka_1_1MockMpdNotifier.html b/docs/dc/d5c/classshaka_1_1MockMpdNotifier.html
index 51dc6888c9..ce3f6ab88b 100644
--- a/docs/dc/d5c/classshaka_1_1MockMpdNotifier.html
+++ b/docs/dc/d5c/classshaka_1_1MockMpdNotifier.html
@@ -160,7 +160,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d69/structshaka_1_1media_1_1mp4_1_1CueSettingsBox-members.html b/docs/dc/d69/structshaka_1_1media_1_1mp4_1_1CueSettingsBox-members.html
index 09d5e50155..3c04773766 100644
--- a/docs/dc/d69/structshaka_1_1media_1_1mp4_1_1CueSettingsBox-members.html
+++ b/docs/dc/d69/structshaka_1_1media_1_1mp4_1_1CueSettingsBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d6f/classshaka_1_1media_1_1webm_1_1Segmenter-members.html b/docs/dc/d6f/classshaka_1_1media_1_1webm_1_1Segmenter-members.html
index 03e85d2cbf..75e7b4ef91 100644
--- a/docs/dc/d6f/classshaka_1_1media_1_1webm_1_1Segmenter-members.html
+++ b/docs/dc/d6f/classshaka_1_1media_1_1webm_1_1Segmenter-members.html
@@ -121,7 +121,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d71/classshaka_1_1media_1_1mp2t_1_1TsSection-members.html b/docs/dc/d71/classshaka_1_1media_1_1mp2t_1_1TsSection-members.html
index 2f600081ac..b21322d4df 100644
--- a/docs/dc/d71/classshaka_1_1media_1_1mp2t_1_1TsSection-members.html
+++ b/docs/dc/d71/classshaka_1_1media_1_1mp2t_1_1TsSection-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d73/classshaka_1_1media_1_1MockMuxerListener.html b/docs/dc/d73/classshaka_1_1media_1_1MockMuxerListener.html
index c522faa82f..291f0308ea 100644
--- a/docs/dc/d73/classshaka_1_1media_1_1MockMuxerListener.html
+++ b/docs/dc/d73/classshaka_1_1media_1_1MockMuxerListener.html
@@ -157,7 +157,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d7b/closure__thread_8cc_source.html b/docs/dc/d7b/closure__thread_8cc_source.html
index 8602dcaa11..751d4bdcfc 100644
--- a/docs/dc/d7b/closure__thread_8cc_source.html
+++ b/docs/dc/d7b/closure__thread_8cc_source.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d7b/h264__parser_8cc_source.html b/docs/dc/d7b/h264__parser_8cc_source.html
index 8e1156cae4..2ccffa8d64 100644
--- a/docs/dc/d7b/h264__parser_8cc_source.html
+++ b/docs/dc/d7b/h264__parser_8cc_source.html
@@ -95,1176 +95,1170 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_reader.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment">// Implemented according to ISO/IEC 14496-10:2005 7.4.2.1 Sequence parameter set</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment">// RBSP semantics.</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H264Sps&amp; sps,</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;                              uint32_t* coded_width,</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                              uint32_t* coded_height,</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                              uint32_t* pixel_width,</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;                              uint32_t* pixel_height) {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <span class="keywordtype">int</span> crop_x = 0;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keywordtype">int</span> crop_y = 0;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keywordflow">if</span> (sps.frame_cropping_flag) {</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="keywordtype">int</span> sub_width_c = 0;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="keywordtype">int</span> sub_height_c = 0;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    <span class="comment">// Table 6-1.</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    <span class="keywordflow">switch</span> (sps.chroma_format_idc) {</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;      <span class="keywordflow">case</span> 0:  <span class="comment">// monochrome</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;        <span class="comment">// SubWidthC and SubHeightC are not defined for monochrome. For ease of</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;        <span class="comment">// computation afterwards, assign both to 1.</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;        sub_width_c = 1;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;      <span class="keywordflow">case</span> 1:  <span class="comment">// 4:2:0</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;        sub_width_c = 2;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;        sub_height_c = 2;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      <span class="keywordflow">case</span> 2:  <span class="comment">// 4:2:2</span></div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;        sub_width_c = 2;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      <span class="keywordflow">case</span> 3:  <span class="comment">// 4:4:4</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;        sub_width_c = 1;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;        sub_height_c = 1;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;      <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected chroma_format_idc &quot;</span> &lt;&lt; sps.chroma_format_idc;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    }</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="comment">// Formula 7-16, 7-17, 7-18, 7-19.</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keywordtype">int</span> crop_unit_x = sub_width_c;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <span class="keywordtype">int</span> crop_unit_y = sub_height_c * (2 - (sps.frame_mbs_only_flag ? 1 : 0));</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    crop_x = crop_unit_x *</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;             (sps.frame_crop_left_offset + sps.frame_crop_right_offset);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    crop_y = crop_unit_y *</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;             (sps.frame_crop_top_offset + sps.frame_crop_bottom_offset);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  }</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="comment">// Formula 7-10, 7-11.</span></div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">int</span> pic_width_in_mbs = sps.pic_width_in_mbs_minus1 + 1;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  *coded_width = pic_width_in_mbs * 16 - crop_x;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="comment">// Formula 7-13, 7-15.</span></div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">int</span> pic_height_in_mbs = (2 - (sps.frame_mbs_only_flag ? 1 : 0)) *</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                          (sps.pic_height_in_map_units_minus1 + 1);</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  *coded_height = pic_height_in_mbs * 16 - crop_y;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="comment">// 0 means it wasn&#39;t in the SPS and therefore assume 1.</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  *pixel_width = sps.sar_width == 0 ? 1 : sps.sar_width;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  *pixel_height = sps.sar_height == 0 ? 1 : sps.sar_height;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Found coded_width: &quot;</span> &lt;&lt; *coded_width</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; coded_height: &quot;</span> &lt;&lt; *coded_height</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pixel_width: &quot;</span> &lt;&lt; *pixel_width</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pixel_height: &quot;</span> &lt;&lt; *pixel_height;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;}</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsPSlice()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kPSlice);</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;}</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsBSlice()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kBSlice);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;}</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsISlice()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kISlice);</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsSPSlice()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kSPSlice);</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;}</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsSISlice()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kSISlice);</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;}</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;H264Sps::H264Sps() {</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;}</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;H264Pps::H264Pps() {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;}</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;H264SliceHeader::H264SliceHeader() {</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;}</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;H264SEIMessage::H264SEIMessage() {</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;}</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;<span class="preprocessor">#define READ_BITS_OR_RETURN(num_bits, out)                                 \</span></div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;<span class="preprocessor">  do {                                                                     \</span></div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadBits(num_bits, (out))) {                                  \</span></div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="preprocessor">      DVLOG(1)                                                             \</span></div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;<span class="preprocessor">          &lt;&lt; &quot;Error in stream: unexpected EOS while trying to read &quot; #out; \</span></div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;<span class="preprocessor">      return kInvalidStream;                                               \</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;<span class="preprocessor">    }                                                                      \</span></div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;<span class="preprocessor">#define READ_BOOL_OR_RETURN(out)                                           \</span></div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;<span class="preprocessor">  do {                                                                     \</span></div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;<span class="preprocessor">    int _out;                                                              \</span></div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadBits(1, &amp;_out)) {                                         \</span></div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;<span class="preprocessor">      DVLOG(1)                                                             \</span></div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;<span class="preprocessor">          &lt;&lt; &quot;Error in stream: unexpected EOS while trying to read &quot; #out; \</span></div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;<span class="preprocessor">      return kInvalidStream;                                               \</span></div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;<span class="preprocessor">    }                                                                      \</span></div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;<span class="preprocessor">    *(out) = _out != 0;                                                    \</span></div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;<span class="preprocessor">#define READ_UE_OR_RETURN(out)                                                 \</span></div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;<span class="preprocessor">  do {                                                                         \</span></div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadUE(out)) {                                                    \</span></div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value while trying to read &quot; #out; \</span></div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                   \</span></div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="preprocessor">    }                                                                          \</span></div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;<span class="preprocessor">#define READ_SE_OR_RETURN(out)                                                 \</span></div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;<span class="preprocessor">  do {                                                                         \</span></div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadSE(out)) {                                                    \</span></div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value while trying to read &quot; #out; \</span></div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                   \</span></div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;<span class="preprocessor">    }                                                                          \</span></div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;<span class="preprocessor">#define IN_RANGE_OR_RETURN(val, min, max)                                   \</span></div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="preprocessor">  do {                                                                      \</span></div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;<span class="preprocessor">    if ((val) &lt; (min) || (val) &gt; (max)) {                                   \</span></div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value, expected &quot; #val &quot; to be&quot; \</span></div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="preprocessor">               &lt;&lt; &quot; in range [&quot; &lt;&lt; (min) &lt;&lt; &quot;:&quot; &lt;&lt; (max) &lt;&lt; &quot;]&quot;             \</span></div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="preprocessor">               &lt;&lt; &quot; found &quot; &lt;&lt; (val) &lt;&lt; &quot; instead&quot;;                         \</span></div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                \</span></div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;<span class="preprocessor">    }                                                                       \</span></div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;<span class="preprocessor">#define TRUE_OR_RETURN(a)                                            \</span></div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;<span class="preprocessor">  do {                                                               \</span></div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;<span class="preprocessor">    if (!(a)) {                                                      \</span></div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value, expected &quot; &lt;&lt; #a; \</span></div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;<span class="preprocessor">      return kInvalidStream;                                         \</span></div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;<span class="preprocessor">    }                                                                \</span></div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;<span class="preprocessor">  } while (0)</span></div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;<span class="keyword">enum</span> AspectRatioIdc {</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  kExtendedSar = 255,</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;};</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;<span class="comment">// ISO 14496 part 10</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;<span class="comment">// VUI parameters: Table E-1 &quot;Meaning of sample aspect ratio indicator&quot;</span></div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kTableSarWidth[] = {</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  0, 1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;};</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kTableSarHeight[] = {</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  0, 1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;};</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;static_assert(arraysize(kTableSarWidth) == arraysize(kTableSarHeight),</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;              <span class="stringliteral">&quot;sar_tables_must_have_same_size&quot;</span>);</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;H264Parser::H264Parser() {}</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;H264Parser::~H264Parser() {</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  STLDeleteValues(&amp;active_SPSes_);</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  STLDeleteValues(&amp;active_PPSes_);</div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/buffer_reader.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment">// Implemented according to ISO/IEC 14496-10:2005 7.4.2.1 Sequence parameter set</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment">// RBSP semantics.</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keywordtype">bool</span> ExtractResolutionFromSps(<span class="keyword">const</span> H264Sps&amp; sps,</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;                              uint32_t* coded_width,</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;                              uint32_t* coded_height,</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                              uint32_t* pixel_width,</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                              uint32_t* pixel_height) {</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  <span class="keywordtype">int</span> crop_x = 0;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <span class="keywordtype">int</span> crop_y = 0;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keywordflow">if</span> (sps.frame_cropping_flag) {</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    <span class="keywordtype">int</span> sub_width_c = 0;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="keywordtype">int</span> sub_height_c = 0;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="comment">// Table 6-1.</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    <span class="keywordflow">switch</span> (sps.chroma_format_idc) {</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;      <span class="keywordflow">case</span> 0:  <span class="comment">// monochrome</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;        <span class="comment">// SubWidthC and SubHeightC are not defined for monochrome. For ease of</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;        <span class="comment">// computation afterwards, assign both to 1.</span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;        sub_width_c = 1;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;      <span class="keywordflow">case</span> 1:  <span class="comment">// 4:2:0</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;        sub_width_c = 2;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;        sub_height_c = 2;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      <span class="keywordflow">case</span> 2:  <span class="comment">// 4:2:2</span></div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;        sub_width_c = 2;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      <span class="keywordflow">case</span> 3:  <span class="comment">// 4:4:4</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;        sub_width_c = 1;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;        sub_height_c = 1;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;      <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected chroma_format_idc &quot;</span> &lt;&lt; sps.chroma_format_idc;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    }</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="comment">// Formula 7-16, 7-17, 7-18, 7-19.</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordtype">int</span> crop_unit_x = sub_width_c;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keywordtype">int</span> crop_unit_y = sub_height_c * (2 - (sps.frame_mbs_only_flag ? 1 : 0));</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    crop_x = crop_unit_x *</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;             (sps.frame_crop_left_offset + sps.frame_crop_right_offset);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    crop_y = crop_unit_y *</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;             (sps.frame_crop_top_offset + sps.frame_crop_bottom_offset);</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  }</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="comment">// Formula 7-10, 7-11.</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">int</span> pic_width_in_mbs = sps.pic_width_in_mbs_minus1 + 1;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  *coded_width = pic_width_in_mbs * 16 - crop_x;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="comment">// Formula 7-13, 7-15.</span></div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">int</span> pic_height_in_mbs = (2 - (sps.frame_mbs_only_flag ? 1 : 0)) *</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                          (sps.pic_height_in_map_units_minus1 + 1);</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  *coded_height = pic_height_in_mbs * 16 - crop_y;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="comment">// 0 means it wasn&#39;t in the SPS and therefore assume 1.</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  *pixel_width = sps.sar_width == 0 ? 1 : sps.sar_width;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  *pixel_height = sps.sar_height == 0 ? 1 : sps.sar_height;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Found coded_width: &quot;</span> &lt;&lt; *coded_width</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; coded_height: &quot;</span> &lt;&lt; *coded_height</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pixel_width: &quot;</span> &lt;&lt; *pixel_width</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pixel_height: &quot;</span> &lt;&lt; *pixel_height;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;}</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsPSlice()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kPSlice);</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;}</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsBSlice()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kBSlice);</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;}</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsISlice()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kISlice);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;}</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsSPSlice()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kSPSlice);</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;}</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;<span class="keywordtype">bool</span> H264SliceHeader::IsSISlice()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordflow">return</span> (slice_type % 5 == kSISlice);</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;}</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;H264Sps::H264Sps() {</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;}</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;H264Pps::H264Pps() {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;}</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;H264SliceHeader::H264SliceHeader() {</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;}</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;H264SEIMessage::H264SEIMessage() {</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  memset(<span class="keyword">this</span>, 0, <span class="keyword">sizeof</span>(*<span class="keyword">this</span>));</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;<span class="preprocessor">#define READ_BITS_OR_RETURN(num_bits, out)                                 \</span></div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;<span class="preprocessor">  do {                                                                     \</span></div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadBits(num_bits, (out))) {                                  \</span></div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;<span class="preprocessor">      DVLOG(1)                                                             \</span></div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="preprocessor">          &lt;&lt; &quot;Error in stream: unexpected EOS while trying to read &quot; #out; \</span></div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;<span class="preprocessor">      return kInvalidStream;                                               \</span></div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;<span class="preprocessor">    }                                                                      \</span></div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;<span class="preprocessor">#define READ_BOOL_OR_RETURN(out)                                           \</span></div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;<span class="preprocessor">  do {                                                                     \</span></div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;<span class="preprocessor">    int _out;                                                              \</span></div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadBits(1, &amp;_out)) {                                         \</span></div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;<span class="preprocessor">      DVLOG(1)                                                             \</span></div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;<span class="preprocessor">          &lt;&lt; &quot;Error in stream: unexpected EOS while trying to read &quot; #out; \</span></div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;<span class="preprocessor">      return kInvalidStream;                                               \</span></div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;<span class="preprocessor">    }                                                                      \</span></div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;<span class="preprocessor">    *(out) = _out != 0;                                                    \</span></div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;<span class="preprocessor">#define READ_UE_OR_RETURN(out)                                                 \</span></div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;<span class="preprocessor">  do {                                                                         \</span></div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadUE(out)) {                                                    \</span></div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value while trying to read &quot; #out; \</span></div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                   \</span></div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;<span class="preprocessor">    }                                                                          \</span></div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;<span class="preprocessor">#define READ_SE_OR_RETURN(out)                                                 \</span></div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;<span class="preprocessor">  do {                                                                         \</span></div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;<span class="preprocessor">    if (!br-&gt;ReadSE(out)) {                                                    \</span></div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value while trying to read &quot; #out; \</span></div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                   \</span></div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="preprocessor">    }                                                                          \</span></div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;<span class="preprocessor">#define IN_RANGE_OR_RETURN(val, min, max)                                   \</span></div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;<span class="preprocessor">  do {                                                                      \</span></div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="preprocessor">    if ((val) &lt; (min) || (val) &gt; (max)) {                                   \</span></div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value, expected &quot; #val &quot; to be&quot; \</span></div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;<span class="preprocessor">               &lt;&lt; &quot; in range [&quot; &lt;&lt; (min) &lt;&lt; &quot;:&quot; &lt;&lt; (max) &lt;&lt; &quot;]&quot;             \</span></div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="preprocessor">               &lt;&lt; &quot; found &quot; &lt;&lt; (val) &lt;&lt; &quot; instead&quot;;                         \</span></div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="preprocessor">      return kInvalidStream;                                                \</span></div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;<span class="preprocessor">    }                                                                       \</span></div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;<span class="preprocessor">#define TRUE_OR_RETURN(a)                                            \</span></div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;<span class="preprocessor">  do {                                                               \</span></div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;<span class="preprocessor">    if (!(a)) {                                                      \</span></div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;<span class="preprocessor">      DVLOG(1) &lt;&lt; &quot;Error in stream: invalid value, expected &quot; &lt;&lt; #a; \</span></div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;<span class="preprocessor">      return kInvalidStream;                                         \</span></div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;<span class="preprocessor">    }                                                                \</span></div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;<span class="preprocessor">  } while (0)</span></div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;<span class="keyword">enum</span> AspectRatioIdc {</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  kExtendedSar = 255,</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;};</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;<span class="comment">// ISO 14496 part 10</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;<span class="comment">// VUI parameters: Table E-1 &quot;Meaning of sample aspect ratio indicator&quot;</span></div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kTableSarWidth[] = {</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  0, 1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;};</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kTableSarHeight[] = {</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  0, 1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;};</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;static_assert(arraysize(kTableSarWidth) == arraysize(kTableSarHeight),</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;              <span class="stringliteral">&quot;sar_tables_must_have_same_size&quot;</span>);</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;H264Parser::H264Parser() {}</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;H264Parser::~H264Parser() {}</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;<span class="keyword">const</span> H264Pps* H264Parser::GetPps(<span class="keywordtype">int</span> pps_id) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <span class="keywordflow">return</span> active_PPSes_[pps_id].get();</div>
 <div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;}</div>
 <div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;<span class="keyword">const</span> H264Pps* H264Parser::GetPps(<span class="keywordtype">int</span> pps_id) {</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">return</span> active_PPSes_[pps_id];</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;<span class="keyword">const</span> H264Sps* H264Parser::GetSps(<span class="keywordtype">int</span> sps_id) {</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">return</span> active_SPSes_[sps_id].get();</div>
 <div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;}</div>
 <div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;<span class="keyword">const</span> H264Sps* H264Parser::GetSps(<span class="keywordtype">int</span> sps_id) {</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordflow">return</span> active_SPSes_[sps_id];</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;}</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;<span class="comment">// Default scaling lists (per spec).</span></div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault4x4Intra[kH264ScalingList4x4Length] = {</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    6, 13, 13, 20, 20, 20, 28, 28, 28, 28, 32, 32, 32, 37, 37, 42, };</div>
 <div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;<span class="comment">// Default scaling lists (per spec).</span></div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault4x4Intra[kH264ScalingList4x4Length] = {</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    6, 13, 13, 20, 20, 20, 28, 28, 28, 28, 32, 32, 32, 37, 37, 42, };</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault4x4Inter[kH264ScalingList4x4Length] = {</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    10, 14, 14, 20, 20, 20, 24, 24, 24, 24, 27, 27, 27, 30, 30, 34, };</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault8x8Intra[kH264ScalingList8x8Length] = {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    6,  10, 10, 13, 11, 13, 16, 16, 16, 16, 18, 18, 18, 18, 18, 23,</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    23, 23, 23, 23, 23, 25, 25, 25, 25, 25, 25, 25, 27, 27, 27, 27,</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    27, 27, 27, 27, 29, 29, 29, 29, 29, 29, 29, 31, 31, 31, 31, 31,</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    31, 33, 33, 33, 33, 33, 36, 36, 36, 36, 38, 38, 38, 40, 40, 42, };</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault8x8Inter[kH264ScalingList8x8Length] = {</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    9,  13, 13, 15, 13, 15, 17, 17, 17, 17, 19, 19, 19, 19, 19, 21,</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 24, 24, 24, 24,</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 27, 27, 27, 27, 27,</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    27, 28, 28, 28, 28, 28, 30, 30, 30, 30, 32, 32, 32, 33, 33, 35, };</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;<span class="keyword">static</span> <span class="keyword">inline</span> <span class="keywordtype">void</span> DefaultScalingList4x4(</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    <span class="keywordtype">int</span> i,</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordtype">int</span> scaling_list4x4[][kH264ScalingList4x4Length]) {</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  DCHECK_LT(i, 6);</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="keywordflow">if</span> (i &lt; 3)</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    memcpy(scaling_list4x4[i], kDefault4x4Intra, <span class="keyword">sizeof</span>(kDefault4x4Intra));</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordflow">else</span> <span class="keywordflow">if</span> (i &lt; 6)</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    memcpy(scaling_list4x4[i], kDefault4x4Inter, <span class="keyword">sizeof</span>(kDefault4x4Inter));</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;}</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;<span class="keyword">static</span> <span class="keyword">inline</span> <span class="keywordtype">void</span> DefaultScalingList8x8(</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <span class="keywordtype">int</span> i,</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="keywordtype">int</span> scaling_list8x8[][kH264ScalingList8x8Length]) {</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  DCHECK_LT(i, 6);</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">if</span> (i % 2 == 0)</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    memcpy(scaling_list8x8[i], kDefault8x8Intra, <span class="keyword">sizeof</span>(kDefault8x8Intra));</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  <span class="keywordflow">else</span></div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    memcpy(scaling_list8x8[i], kDefault8x8Inter, <span class="keyword">sizeof</span>(kDefault8x8Inter));</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;}</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FallbackScalingList4x4(</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    <span class="keywordtype">int</span> i,</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_intra[],</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_inter[],</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;    <span class="keywordtype">int</span> scaling_list4x4[][kH264ScalingList4x4Length]) {</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kScalingList4x4ByteSize =</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;      <span class="keyword">sizeof</span>(scaling_list4x4[0][0]) * kH264ScalingList4x4Length;</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;  <span class="keywordflow">switch</span> (i) {</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    <span class="keywordflow">case</span> 0:</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;      memcpy(scaling_list4x4[i], default_scaling_list_intra,</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;             kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault4x4Inter[kH264ScalingList4x4Length] = {</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    10, 14, 14, 20, 20, 20, 24, 24, 24, 24, 27, 27, 27, 30, 30, 34, };</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault8x8Intra[kH264ScalingList8x8Length] = {</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    6,  10, 10, 13, 11, 13, 16, 16, 16, 16, 18, 18, 18, 18, 18, 23,</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    23, 23, 23, 23, 23, 25, 25, 25, 25, 25, 25, 25, 27, 27, 27, 27,</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;    27, 27, 27, 27, 29, 29, 29, 29, 29, 29, 29, 31, 31, 31, 31, 31,</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    31, 33, 33, 33, 33, 33, 36, 36, 36, 36, 38, 38, 38, 40, 40, 42, };</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kDefault8x8Inter[kH264ScalingList8x8Length] = {</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    9,  13, 13, 15, 13, 15, 17, 17, 17, 17, 19, 19, 19, 19, 19, 21,</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 24, 24, 24, 24,</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 27, 27, 27, 27, 27,</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    27, 28, 28, 28, 28, 28, 30, 30, 30, 30, 32, 32, 32, 33, 33, 35, };</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;<span class="keyword">static</span> <span class="keyword">inline</span> <span class="keywordtype">void</span> DefaultScalingList4x4(</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    <span class="keywordtype">int</span> i,</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="keywordtype">int</span> scaling_list4x4[][kH264ScalingList4x4Length]) {</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  DCHECK_LT(i, 6);</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordflow">if</span> (i &lt; 3)</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    memcpy(scaling_list4x4[i], kDefault4x4Intra, <span class="keyword">sizeof</span>(kDefault4x4Intra));</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keywordflow">else</span> <span class="keywordflow">if</span> (i &lt; 6)</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    memcpy(scaling_list4x4[i], kDefault4x4Inter, <span class="keyword">sizeof</span>(kDefault4x4Inter));</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;}</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;<span class="keyword">static</span> <span class="keyword">inline</span> <span class="keywordtype">void</span> DefaultScalingList8x8(</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    <span class="keywordtype">int</span> i,</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordtype">int</span> scaling_list8x8[][kH264ScalingList8x8Length]) {</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  DCHECK_LT(i, 6);</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  <span class="keywordflow">if</span> (i % 2 == 0)</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    memcpy(scaling_list8x8[i], kDefault8x8Intra, <span class="keyword">sizeof</span>(kDefault8x8Intra));</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keywordflow">else</span></div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    memcpy(scaling_list8x8[i], kDefault8x8Inter, <span class="keyword">sizeof</span>(kDefault8x8Inter));</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;}</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FallbackScalingList4x4(</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordtype">int</span> i,</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_intra[],</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_inter[],</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    <span class="keywordtype">int</span> scaling_list4x4[][kH264ScalingList4x4Length]) {</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kScalingList4x4ByteSize =</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;      <span class="keyword">sizeof</span>(scaling_list4x4[0][0]) * kH264ScalingList4x4Length;</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  <span class="keywordflow">switch</span> (i) {</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    <span class="keywordflow">case</span> 0:</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;      memcpy(scaling_list4x4[i], default_scaling_list_intra,</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;             kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    <span class="keywordflow">case</span> 1:</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[0], kScalingList4x4ByteSize);</div>
 <div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">case</span> 1:</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[0], kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">case</span> 2:</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[1], kScalingList4x4ByteSize);</div>
 <div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="keywordflow">case</span> 2:</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[1], kScalingList4x4ByteSize);</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;    <span class="keywordflow">case</span> 3:</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;      memcpy(scaling_list4x4[i], default_scaling_list_inter,</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;             kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="keywordflow">case</span> 3:</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;      memcpy(scaling_list4x4[i], default_scaling_list_inter,</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;             kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    <span class="keywordflow">case</span> 4:</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[3], kScalingList4x4ByteSize);</div>
 <div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    <span class="keywordflow">case</span> 4:</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[3], kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    <span class="keywordflow">case</span> 5:</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[4], kScalingList4x4ByteSize);</div>
 <div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;    <span class="keywordflow">case</span> 5:</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;      memcpy(scaling_list4x4[i], scaling_list4x4[4], kScalingList4x4ByteSize);</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;      NOTREACHED();</div>
 <div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;      NOTREACHED();</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;  }</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;}</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FallbackScalingList8x8(</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;    <span class="keywordtype">int</span> i,</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_intra[],</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_inter[],</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;    <span class="keywordtype">int</span> scaling_list8x8[][kH264ScalingList8x8Length]) {</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kScalingList8x8ByteSize =</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;      <span class="keyword">sizeof</span>(scaling_list8x8[0][0]) * kH264ScalingList8x8Length;</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;  <span class="keywordflow">switch</span> (i) {</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;    <span class="keywordflow">case</span> 0:</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;      memcpy(scaling_list8x8[i], default_scaling_list_intra,</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;             kScalingList8x8ByteSize);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;    <span class="keywordflow">case</span> 1:</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;      memcpy(scaling_list8x8[i], default_scaling_list_inter,</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;             kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;  }</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;}</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FallbackScalingList8x8(</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;    <span class="keywordtype">int</span> i,</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_intra[],</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">int</span> default_scaling_list_inter[],</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;    <span class="keywordtype">int</span> scaling_list8x8[][kH264ScalingList8x8Length]) {</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kScalingList8x8ByteSize =</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;      <span class="keyword">sizeof</span>(scaling_list8x8[0][0]) * kH264ScalingList8x8Length;</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  <span class="keywordflow">switch</span> (i) {</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;    <span class="keywordflow">case</span> 0:</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;      memcpy(scaling_list8x8[i], default_scaling_list_intra,</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;             kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;    <span class="keywordflow">case</span> 1:</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;      memcpy(scaling_list8x8[i], default_scaling_list_inter,</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;             kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;    <span class="keywordflow">case</span> 2:</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[0], kScalingList8x8ByteSize);</div>
 <div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    <span class="keywordflow">case</span> 2:</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[0], kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    <span class="keywordflow">case</span> 3:</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[1], kScalingList8x8ByteSize);</div>
 <div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;    <span class="keywordflow">case</span> 3:</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[1], kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;    <span class="keywordflow">case</span> 4:</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[2], kScalingList8x8ByteSize);</div>
 <div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    <span class="keywordflow">case</span> 4:</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[2], kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    <span class="keywordflow">case</span> 5:</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[3], kScalingList8x8ByteSize);</div>
 <div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;      <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    <span class="keywordflow">case</span> 5:</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      memcpy(scaling_list8x8[i], scaling_list8x8[3], kScalingList8x8ByteSize);</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      NOTREACHED();</div>
 <div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;      NOTREACHED();</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  }</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;}</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;H264Parser::Result H264Parser::ParseScalingList(H26xBitReader* br,</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;                                                <span class="keywordtype">int</span> size,</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;                                                <span class="keywordtype">int</span>* scaling_list,</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;                                                <span class="keywordtype">bool</span>* use_default) {</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  <span class="comment">// See chapter 7.3.2.1.1.1.</span></div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  <span class="keywordtype">int</span> last_scale = 8;</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  <span class="keywordtype">int</span> next_scale = 8;</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  <span class="keywordtype">int</span> delta_scale;</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;  *use_default = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; size; ++j) {</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;    <span class="keywordflow">if</span> (next_scale != 0) {</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;      READ_SE_OR_RETURN(&amp;delta_scale);</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;      IN_RANGE_OR_RETURN(delta_scale, -128, 127);</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;      next_scale = (last_scale + delta_scale + 256) &amp; 0xff;</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;      <span class="keywordflow">if</span> (j == 0 &amp;&amp; next_scale == 0) {</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;        *use_default = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;        <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;      }</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;    }</div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;  }</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;}</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;H264Parser::Result H264Parser::ParseScalingList(H26xBitReader* br,</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                                                <span class="keywordtype">int</span> size,</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                                                <span class="keywordtype">int</span>* scaling_list,</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;                                                <span class="keywordtype">bool</span>* use_default) {</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  <span class="comment">// See chapter 7.3.2.1.1.1.</span></div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  <span class="keywordtype">int</span> last_scale = 8;</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;  <span class="keywordtype">int</span> next_scale = 8;</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  <span class="keywordtype">int</span> delta_scale;</div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  *use_default = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; size; ++j) {</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;    <span class="keywordflow">if</span> (next_scale != 0) {</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;      READ_SE_OR_RETURN(&amp;delta_scale);</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;      IN_RANGE_OR_RETURN(delta_scale, -128, 127);</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;      next_scale = (last_scale + delta_scale + 256) &amp; 0xff;</div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;      <span class="keywordflow">if</span> (j == 0 &amp;&amp; next_scale == 0) {</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;        *use_default = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;        <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;      }</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;    }</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;    scaling_list[j] = (next_scale == 0) ? last_scale : next_scale;</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;    last_scale = scaling_list[j];</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  }</div>
 <div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;    scaling_list[j] = (next_scale == 0) ? last_scale : next_scale;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;    last_scale = scaling_list[j];</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  }</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;}</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;H264Parser::Result H264Parser::ParseSpsScalingLists(H26xBitReader* br,</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;                                                    H264Sps* sps) {</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="comment">// See 7.4.2.1.1.</span></div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="keywordtype">bool</span> seq_scaling_list_present_flag;</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="keywordtype">bool</span> use_default;</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;  Result res;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;}</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;H264Parser::Result H264Parser::ParseSpsScalingLists(H26xBitReader* br,</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;                                                    H264Sps* sps) {</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  <span class="comment">// See 7.4.2.1.1.</span></div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  <span class="keywordtype">bool</span> seq_scaling_list_present_flag;</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;  <span class="keywordtype">bool</span> use_default;</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;  Result res;</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="comment">// Parse scaling_list4x4.</span></div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i) {</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;    READ_BOOL_OR_RETURN(&amp;seq_scaling_list_present_flag);</div>
 <div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  <span class="comment">// Parse scaling_list4x4.</span></div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i) {</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;    READ_BOOL_OR_RETURN(&amp;seq_scaling_list_present_flag);</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;    <span class="keywordflow">if</span> (seq_scaling_list_present_flag) {</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;      res = ParseScalingList(br,</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;                             arraysize(sps-&gt;scaling_list4x4[i]),</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;                             sps-&gt;scaling_list4x4[i],</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;                             &amp;use_default);</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;        DefaultScalingList4x4(i, sps-&gt;scaling_list4x4);</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;      FallbackScalingList4x4(</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;          i, kDefault4x4Intra, kDefault4x4Inter, sps-&gt;scaling_list4x4);</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    }</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;  }</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    <span class="keywordflow">if</span> (seq_scaling_list_present_flag) {</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      res = ParseScalingList(br,</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;                             arraysize(sps-&gt;scaling_list4x4[i]),</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;                             sps-&gt;scaling_list4x4[i],</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;                             &amp;use_default);</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;        DefaultScalingList4x4(i, sps-&gt;scaling_list4x4);</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;      FallbackScalingList4x4(</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;          i, kDefault4x4Intra, kDefault4x4Inter, sps-&gt;scaling_list4x4);</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    }</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  }</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;  <span class="comment">// Parse scaling_list8x8.</span></div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ((sps-&gt;chroma_format_idc != 3) ? 2 : 6); ++i) {</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    READ_BOOL_OR_RETURN(&amp;seq_scaling_list_present_flag);</div>
 <div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;  <span class="comment">// Parse scaling_list8x8.</span></div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ((sps-&gt;chroma_format_idc != 3) ? 2 : 6); ++i) {</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    READ_BOOL_OR_RETURN(&amp;seq_scaling_list_present_flag);</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;    <span class="keywordflow">if</span> (seq_scaling_list_present_flag) {</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;      res = ParseScalingList(br,</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;                             arraysize(sps-&gt;scaling_list8x8[i]),</div>
-<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;                             sps-&gt;scaling_list8x8[i],</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;                             &amp;use_default);</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;        DefaultScalingList8x8(i, sps-&gt;scaling_list8x8);</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;      FallbackScalingList8x8(</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;          i, kDefault8x8Intra, kDefault8x8Inter, sps-&gt;scaling_list8x8);</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;    }</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  }</div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;</div>
-<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;}</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;H264Parser::Result H264Parser::ParsePpsScalingLists(H26xBitReader* br,</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;                                                    <span class="keyword">const</span> H264Sps&amp; sps,</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;                                                    H264Pps* pps) {</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  <span class="comment">// See 7.4.2.2.</span></div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  <span class="keywordtype">bool</span> pic_scaling_list_present_flag;</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  <span class="keywordtype">bool</span> use_default;</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;  Result res;</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i) {</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;    READ_BOOL_OR_RETURN(&amp;pic_scaling_list_present_flag);</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;    <span class="keywordflow">if</span> (pic_scaling_list_present_flag) {</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;      res = ParseScalingList(br,</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;                             arraysize(pps-&gt;scaling_list4x4[i]),</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;                             pps-&gt;scaling_list4x4[i],</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;                             &amp;use_default);</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;        DefaultScalingList4x4(i, pps-&gt;scaling_list4x4);</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;      <span class="keywordflow">if</span> (sps.seq_scaling_matrix_present_flag) {</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;        <span class="comment">// Table 7-2 fallback rule A in spec.</span></div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;        FallbackScalingList4x4(</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;            i, kDefault4x4Intra, kDefault4x4Inter, pps-&gt;scaling_list4x4);</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;        <span class="comment">// Table 7-2 fallback rule B in spec.</span></div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;        FallbackScalingList4x4(i,</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;                               sps.scaling_list4x4[0],</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;                               sps.scaling_list4x4[3],</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;                               pps-&gt;scaling_list4x4);</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;      }</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;    }</div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  }</div>
+<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;    <span class="keywordflow">if</span> (seq_scaling_list_present_flag) {</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;      res = ParseScalingList(br,</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;                             arraysize(sps-&gt;scaling_list8x8[i]),</div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;                             sps-&gt;scaling_list8x8[i],</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;                             &amp;use_default);</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00388"></a><span class="lineno">  388</span>&#160;</div>
+<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
+<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;        DefaultScalingList8x8(i, sps-&gt;scaling_list8x8);</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;</div>
+<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;      FallbackScalingList8x8(</div>
+<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;          i, kDefault8x8Intra, kDefault8x8Inter, sps-&gt;scaling_list8x8);</div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;    }</div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  }</div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;}</div>
+<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;</div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;H264Parser::Result H264Parser::ParsePpsScalingLists(H26xBitReader* br,</div>
+<div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;                                                    <span class="keyword">const</span> H264Sps&amp; sps,</div>
+<div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;                                                    H264Pps* pps) {</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  <span class="comment">// See 7.4.2.2.</span></div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  <span class="keywordtype">bool</span> pic_scaling_list_present_flag;</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  <span class="keywordtype">bool</span> use_default;</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;  Result res;</div>
+<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i) {</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;    READ_BOOL_OR_RETURN(&amp;pic_scaling_list_present_flag);</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;</div>
+<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;    <span class="keywordflow">if</span> (pic_scaling_list_present_flag) {</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;      res = ParseScalingList(br,</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;                             arraysize(pps-&gt;scaling_list4x4[i]),</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;                             pps-&gt;scaling_list4x4[i],</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;                             &amp;use_default);</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;      <span class="keywordflow">if</span> (use_default)</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;        DefaultScalingList4x4(i, pps-&gt;scaling_list4x4);</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;      <span class="keywordflow">if</span> (sps.seq_scaling_matrix_present_flag) {</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;        <span class="comment">// Table 7-2 fallback rule A in spec.</span></div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;        FallbackScalingList4x4(</div>
+<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;            i, kDefault4x4Intra, kDefault4x4Inter, pps-&gt;scaling_list4x4);</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;        <span class="comment">// Table 7-2 fallback rule B in spec.</span></div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;        FallbackScalingList4x4(i,</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;                               sps.scaling_list4x4[0],</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;                               sps.scaling_list4x4[3],</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;                               pps-&gt;scaling_list4x4);</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;      }</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;    }</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  }</div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;transform_8x8_mode_flag) {</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ((sps.chroma_format_idc != 3) ? 2 : 6); ++i) {</div>
+<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;      READ_BOOL_OR_RETURN(&amp;pic_scaling_list_present_flag);</div>
 <div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;transform_8x8_mode_flag) {</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; ((sps.chroma_format_idc != 3) ? 2 : 6); ++i) {</div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;      READ_BOOL_OR_RETURN(&amp;pic_scaling_list_present_flag);</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;</div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;      <span class="keywordflow">if</span> (pic_scaling_list_present_flag) {</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;        res = ParseScalingList(br,</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;                               arraysize(pps-&gt;scaling_list8x8[i]),</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;                               pps-&gt;scaling_list8x8[i],</div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;                               &amp;use_default);</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;        <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;          <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;        <span class="keywordflow">if</span> (use_default)</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;          DefaultScalingList8x8(i, pps-&gt;scaling_list8x8);</div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;        <span class="keywordflow">if</span> (sps.seq_scaling_matrix_present_flag) {</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;          <span class="comment">// Table 7-2 fallback rule A in spec.</span></div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;          FallbackScalingList8x8(</div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;              i, kDefault8x8Intra, kDefault8x8Inter, pps-&gt;scaling_list8x8);</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;        } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;          <span class="comment">// Table 7-2 fallback rule B in spec.</span></div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;          FallbackScalingList8x8(i,</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;                                 sps.scaling_list8x8[0],</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;                                 sps.scaling_list8x8[1],</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;                                 pps-&gt;scaling_list8x8);</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;        }</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;      }</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;    }</div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  }</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;}</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;H264Parser::Result H264Parser::ParseAndIgnoreHRDParameters(</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;    H26xBitReader* br, <span class="keywordtype">bool</span>* hrd_parameters_present) {</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  <span class="keywordtype">int</span> data;</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// {nal,vcl}_hrd_parameters_present_flag</span></div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  <span class="keywordflow">if</span> (!data)</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;    <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  *hrd_parameters_present = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;  <span class="keywordtype">int</span> cpb_cnt_minus1;</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  READ_UE_OR_RETURN(&amp;cpb_cnt_minus1);</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;  IN_RANGE_OR_RETURN(cpb_cnt_minus1, 0, 31);</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  READ_BITS_OR_RETURN(8, &amp;data);  <span class="comment">// bit_rate_scale, cpb_size_scale</span></div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= cpb_cnt_minus1; ++i) {</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// bit_rate_value_minus1[i]</span></div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// cpb_size_value_minus1[i]</span></div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// cbr_flag</span></div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;  }</div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;  READ_BITS_OR_RETURN(20, &amp;data);  <span class="comment">// cpb/dpb delays, etc.</span></div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;</div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;}</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;</div>
-<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;H264Parser::Result H264Parser::ParseVUIParameters(H26xBitReader* br,</div>
-<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;                                                  H264Sps* sps) {</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  <span class="keywordtype">bool</span> aspect_ratio_info_present_flag;</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  READ_BOOL_OR_RETURN(&amp;aspect_ratio_info_present_flag);</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;  <span class="keywordflow">if</span> (aspect_ratio_info_present_flag) {</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;    <span class="keywordtype">int</span> aspect_ratio_idc;</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;    READ_BITS_OR_RETURN(8, &amp;aspect_ratio_idc);</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;    <span class="keywordflow">if</span> (aspect_ratio_idc == kExtendedSar) {</div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;      READ_BITS_OR_RETURN(16, &amp;sps-&gt;sar_width);</div>
-<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;      READ_BITS_OR_RETURN(16, &amp;sps-&gt;sar_height);</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;      <span class="keyword">const</span> <span class="keywordtype">int</span> max_aspect_ratio_idc = arraysize(kTableSarWidth) - 1;</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;      IN_RANGE_OR_RETURN(aspect_ratio_idc, 0, max_aspect_ratio_idc);</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;      sps-&gt;sar_width = kTableSarWidth[aspect_ratio_idc];</div>
-<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;      sps-&gt;sar_height = kTableSarHeight[aspect_ratio_idc];</div>
-<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;    }</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  }</div>
-<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;  <span class="keywordtype">int</span> data;</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;  <span class="comment">// Read and ignore overscan and video signal type info.</span></div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// overscan_info_present_flag</span></div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  <span class="keywordflow">if</span> (data)</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// overscan_appropriate_flag</span></div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// video_signal_type_present_flag</span></div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;    READ_BITS_OR_RETURN(3, &amp;data);  <span class="comment">// video_format</span></div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// video_full_range_flag</span></div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// colour_description_present_flag</span></div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;    <span class="keywordflow">if</span> (data)</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;      READ_BITS_OR_RETURN(24, &amp;data);  <span class="comment">// color description syntax elements</span></div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;  }</div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// chroma_loc_info_present_flag</span></div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// chroma_sample_loc_type_top_field</span></div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// chroma_sample_loc_type_bottom_field</span></div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  }</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  <span class="comment">// Read and ignore timing info.</span></div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// timing_info_present_flag</span></div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// num_units_in_tick</span></div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// num_units_in_tick</span></div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// time_scale</span></div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// time_scale</span></div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// fixed_frame_rate_flag</span></div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  }</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  <span class="comment">// Read and ignore NAL HRD parameters, if present.</span></div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;  <span class="keywordtype">bool</span> hrd_parameters_present = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  Result res = ParseAndIgnoreHRDParameters(br, &amp;hrd_parameters_present);</div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;    <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;</div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;  <span class="comment">// Read and ignore VCL HRD parameters, if present.</span></div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  res = ParseAndIgnoreHRDParameters(br, &amp;hrd_parameters_present);</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;    <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  <span class="keywordflow">if</span> (hrd_parameters_present)  <span class="comment">// One of NAL or VCL params present is enough.</span></div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// low_delay_hrd_flag</span></div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// pic_struct_present_flag</span></div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;bitstream_restriction_flag);</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;bitstream_restriction_flag) {</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// motion_vectors_over_pic_boundaries_flag</span></div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// max_bytes_per_pic_denom</span></div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// max_bits_per_mb_denom</span></div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// log2_max_mv_length_horizontal</span></div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// log2_max_mv_length_vertical</span></div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;max_num_reorder_frames);</div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;max_dec_frame_buffering);</div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;    TRUE_OR_RETURN(sps-&gt;max_dec_frame_buffering &gt;= sps-&gt;max_num_ref_frames);</div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;    IN_RANGE_OR_RETURN(</div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;        sps-&gt;max_num_reorder_frames, 0, sps-&gt;max_dec_frame_buffering);</div>
-<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;  }</div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;}</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FillDefaultSeqScalingLists(H264Sps* sps) {</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i)</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; kH264ScalingList4x4Length; ++j)</div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;      sps-&gt;scaling_list4x4[i][j] = 16;</div>
-<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;</div>
-<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;  for (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i)</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; kH264ScalingList8x8Length; ++j)</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;      sps-&gt;scaling_list8x8[i][j] = 16;</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;}</div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;H264Parser::Result H264Parser::ParseSps(<span class="keyword">const</span> Nalu&amp; nalu, <span class="keywordtype">int</span>* sps_id) {</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  <span class="comment">// See 7.4.2.1.</span></div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;  <span class="keywordtype">int</span> data;</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;  Result res;</div>
-<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;  H26xBitReader reader;</div>
-<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
-<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  H26xBitReader* br = &amp;reader;</div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;      <span class="keywordflow">if</span> (pic_scaling_list_present_flag) {</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;        res = ParseScalingList(br,</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;                               arraysize(pps-&gt;scaling_list8x8[i]),</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;                               pps-&gt;scaling_list8x8[i],</div>
+<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;                               &amp;use_default);</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;        <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;          <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;        <span class="keywordflow">if</span> (use_default)</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;          DefaultScalingList8x8(i, pps-&gt;scaling_list8x8);</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;        <span class="keywordflow">if</span> (sps.seq_scaling_matrix_present_flag) {</div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;          <span class="comment">// Table 7-2 fallback rule A in spec.</span></div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;          FallbackScalingList8x8(</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;              i, kDefault8x8Intra, kDefault8x8Inter, pps-&gt;scaling_list8x8);</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;        } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;          <span class="comment">// Table 7-2 fallback rule B in spec.</span></div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;          FallbackScalingList8x8(i,</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;                                 sps.scaling_list8x8[0],</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;                                 sps.scaling_list8x8[1],</div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;                                 pps-&gt;scaling_list8x8);</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;        }</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;      }</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;    }</div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  }</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;}</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;H264Parser::Result H264Parser::ParseAndIgnoreHRDParameters(</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;    H26xBitReader* br, <span class="keywordtype">bool</span>* hrd_parameters_present) {</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  <span class="keywordtype">int</span> data;</div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// {nal,vcl}_hrd_parameters_present_flag</span></div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  <span class="keywordflow">if</span> (!data)</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;    <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  *hrd_parameters_present = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;  <span class="keywordtype">int</span> cpb_cnt_minus1;</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;  READ_UE_OR_RETURN(&amp;cpb_cnt_minus1);</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  IN_RANGE_OR_RETURN(cpb_cnt_minus1, 0, 31);</div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;  READ_BITS_OR_RETURN(8, &amp;data);  <span class="comment">// bit_rate_scale, cpb_size_scale</span></div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt;= cpb_cnt_minus1; ++i) {</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// bit_rate_value_minus1[i]</span></div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// cpb_size_value_minus1[i]</span></div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// cbr_flag</span></div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  }</div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;  READ_BITS_OR_RETURN(20, &amp;data);  <span class="comment">// cpb/dpb delays, etc.</span></div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;}</div>
+<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;</div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;H264Parser::Result H264Parser::ParseVUIParameters(H26xBitReader* br,</div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;                                                  H264Sps* sps) {</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;  <span class="keywordtype">bool</span> aspect_ratio_info_present_flag;</div>
+<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;  READ_BOOL_OR_RETURN(&amp;aspect_ratio_info_present_flag);</div>
+<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;  <span class="keywordflow">if</span> (aspect_ratio_info_present_flag) {</div>
+<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;    <span class="keywordtype">int</span> aspect_ratio_idc;</div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;    READ_BITS_OR_RETURN(8, &amp;aspect_ratio_idc);</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;    <span class="keywordflow">if</span> (aspect_ratio_idc == kExtendedSar) {</div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;      READ_BITS_OR_RETURN(16, &amp;sps-&gt;sar_width);</div>
+<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;      READ_BITS_OR_RETURN(16, &amp;sps-&gt;sar_height);</div>
+<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;      <span class="keyword">const</span> <span class="keywordtype">int</span> max_aspect_ratio_idc = arraysize(kTableSarWidth) - 1;</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;      IN_RANGE_OR_RETURN(aspect_ratio_idc, 0, max_aspect_ratio_idc);</div>
+<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;      sps-&gt;sar_width = kTableSarWidth[aspect_ratio_idc];</div>
+<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;      sps-&gt;sar_height = kTableSarHeight[aspect_ratio_idc];</div>
+<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;    }</div>
+<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;  }</div>
+<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;</div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  <span class="keywordtype">int</span> data;</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;  <span class="comment">// Read and ignore overscan and video signal type info.</span></div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// overscan_info_present_flag</span></div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;  <span class="keywordflow">if</span> (data)</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// overscan_appropriate_flag</span></div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// video_signal_type_present_flag</span></div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;    READ_BITS_OR_RETURN(3, &amp;data);  <span class="comment">// video_format</span></div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// video_full_range_flag</span></div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// colour_description_present_flag</span></div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;    <span class="keywordflow">if</span> (data)</div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;      READ_BITS_OR_RETURN(24, &amp;data);  <span class="comment">// color description syntax elements</span></div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  }</div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// chroma_loc_info_present_flag</span></div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// chroma_sample_loc_type_top_field</span></div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// chroma_sample_loc_type_bottom_field</span></div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  }</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;  <span class="comment">// Read and ignore timing info.</span></div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// timing_info_present_flag</span></div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  <span class="keywordflow">if</span> (data) {</div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// num_units_in_tick</span></div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// num_units_in_tick</span></div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// time_scale</span></div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;    READ_BITS_OR_RETURN(16, &amp;data);  <span class="comment">// time_scale</span></div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// fixed_frame_rate_flag</span></div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;  }</div>
+<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  <span class="comment">// Read and ignore NAL HRD parameters, if present.</span></div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  <span class="keywordtype">bool</span> hrd_parameters_present = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  Result res = ParseAndIgnoreHRDParameters(br, &amp;hrd_parameters_present);</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;    <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  <span class="comment">// Read and ignore VCL HRD parameters, if present.</span></div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  res = ParseAndIgnoreHRDParameters(br, &amp;hrd_parameters_present);</div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;    <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  <span class="keywordflow">if</span> (hrd_parameters_present)  <span class="comment">// One of NAL or VCL params present is enough.</span></div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// low_delay_hrd_flag</span></div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;  READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// pic_struct_present_flag</span></div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;bitstream_restriction_flag);</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;bitstream_restriction_flag) {</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;    READ_BOOL_OR_RETURN(&amp;data);  <span class="comment">// motion_vectors_over_pic_boundaries_flag</span></div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// max_bytes_per_pic_denom</span></div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// max_bits_per_mb_denom</span></div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// log2_max_mv_length_horizontal</span></div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;    READ_UE_OR_RETURN(&amp;data);  <span class="comment">// log2_max_mv_length_vertical</span></div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;max_num_reorder_frames);</div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;max_dec_frame_buffering);</div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;    TRUE_OR_RETURN(sps-&gt;max_dec_frame_buffering &gt;= sps-&gt;max_num_ref_frames);</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;    IN_RANGE_OR_RETURN(</div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;        sps-&gt;max_num_reorder_frames, 0, sps-&gt;max_dec_frame_buffering);</div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;  }</div>
+<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;</div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;}</div>
+<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;<span class="keyword">static</span> <span class="keywordtype">void</span> FillDefaultSeqScalingLists(H264Sps* sps) {</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i)</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; kH264ScalingList4x4Length; ++j)</div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;      sps-&gt;scaling_list4x4[i][j] = 16;</div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;</div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;  for (<span class="keywordtype">int</span> i = 0; i &lt; 6; ++i)</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; kH264ScalingList8x8Length; ++j)</div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;      sps-&gt;scaling_list8x8[i][j] = 16;</div>
+<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;}</div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;H264Parser::Result H264Parser::ParseSps(<span class="keyword">const</span> Nalu&amp; nalu, <span class="keywordtype">int</span>* sps_id) {</div>
+<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;  <span class="comment">// See 7.4.2.1.</span></div>
+<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;  <span class="keywordtype">int</span> data;</div>
+<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;  Result res;</div>
+<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  H26xBitReader reader;</div>
+<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
+<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;  H26xBitReader* br = &amp;reader;</div>
+<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;</div>
+<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;  *sps_id = -1;</div>
+<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;</div>
+<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  std::unique_ptr&lt;H264Sps&gt; sps(<span class="keyword">new</span> H264Sps());</div>
 <div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;</div>
-<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;  *sps_id = -1;</div>
-<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  std::unique_ptr&lt;H264Sps&gt; sps(<span class="keyword">new</span> H264Sps());</div>
-<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;</div>
-<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  READ_BITS_OR_RETURN(8, &amp;sps-&gt;profile_idc);</div>
-<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set0_flag);</div>
-<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set1_flag);</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set2_flag);</div>
-<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set3_flag);</div>
-<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set4_flag);</div>
-<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set5_flag);</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;  READ_BITS_OR_RETURN(2, &amp;data);  <span class="comment">// reserved_zero_2bits</span></div>
-<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;  READ_BITS_OR_RETURN(8, &amp;sps-&gt;level_idc);</div>
-<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;seq_parameter_set_id);</div>
-<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;  TRUE_OR_RETURN(sps-&gt;seq_parameter_set_id &lt; 32);</div>
-<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;</div>
-<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;profile_idc == 100 || sps-&gt;profile_idc == 110 ||</div>
-<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;      sps-&gt;profile_idc == 122 || sps-&gt;profile_idc == 244 ||</div>
-<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;      sps-&gt;profile_idc == 44 || sps-&gt;profile_idc == 83 ||</div>
-<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;      sps-&gt;profile_idc == 86 || sps-&gt;profile_idc == 118 ||</div>
-<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;      sps-&gt;profile_idc == 128) {</div>
-<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;chroma_format_idc);</div>
-<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;    TRUE_OR_RETURN(sps-&gt;chroma_format_idc &lt; 4);</div>
-<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;</div>
-<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;chroma_format_idc == 3)</div>
-<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;      READ_BOOL_OR_RETURN(&amp;sps-&gt;separate_colour_plane_flag);</div>
-<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;</div>
-<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;bit_depth_luma_minus8);</div>
-<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;    TRUE_OR_RETURN(sps-&gt;bit_depth_luma_minus8 &lt; 7);</div>
-<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;</div>
-<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;bit_depth_chroma_minus8);</div>
-<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;    TRUE_OR_RETURN(sps-&gt;bit_depth_chroma_minus8 &lt; 7);</div>
-<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;</div>
-<div class="line"><a name="l00630"></a><span class="lineno">  630</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;qpprime_y_zero_transform_bypass_flag);</div>
-<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;seq_scaling_matrix_present_flag);</div>
-<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;</div>
-<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;seq_scaling_matrix_present_flag) {</div>
-<div class="line"><a name="l00634"></a><span class="lineno">  634</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Scaling matrix present&quot;</span>;</div>
-<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;      res = ParseSpsScalingLists(br, sps.get());</div>
-<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00637"></a><span class="lineno">  637</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;      FillDefaultSeqScalingLists(sps.get());</div>
-<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;    }</div>
-<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;    sps-&gt;chroma_format_idc = 1;</div>
-<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160;    FillDefaultSeqScalingLists(sps.get());</div>
-<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;  }</div>
-<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;</div>
-<div class="line"><a name="l00646"></a><span class="lineno">  646</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag)</div>
-<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;    sps-&gt;chroma_array_type = 0;</div>
-<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;  <span class="keywordflow">else</span></div>
-<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;    sps-&gt;chroma_array_type = sps-&gt;chroma_format_idc;</div>
-<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;</div>
-<div class="line"><a name="l00651"></a><span class="lineno">  651</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;log2_max_frame_num_minus4);</div>
-<div class="line"><a name="l00652"></a><span class="lineno">  652</span>&#160;  TRUE_OR_RETURN(sps-&gt;log2_max_frame_num_minus4 &lt; 13);</div>
-<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;</div>
-<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_order_cnt_type);</div>
-<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;  TRUE_OR_RETURN(sps-&gt;pic_order_cnt_type &lt; 3);</div>
-<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;</div>
-<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;  sps-&gt;expected_delta_per_pic_order_cnt_cycle = 0;</div>
-<div class="line"><a name="l00658"></a><span class="lineno">  658</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 0) {</div>
-<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;log2_max_pic_order_cnt_lsb_minus4);</div>
-<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;    TRUE_OR_RETURN(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 &lt; 13);</div>
-<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 1) {</div>
-<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;delta_pic_order_always_zero_flag);</div>
-<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;    READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_non_ref_pic);</div>
-<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;    READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_top_to_bottom_field);</div>
-<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;num_ref_frames_in_pic_order_cnt_cycle);</div>
-<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;    TRUE_OR_RETURN(sps-&gt;num_ref_frames_in_pic_order_cnt_cycle &lt; 255);</div>
-<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;</div>
-<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_ref_frames_in_pic_order_cnt_cycle; ++i) {</div>
-<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;      READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_ref_frame[i]);</div>
-<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;      sps-&gt;expected_delta_per_pic_order_cnt_cycle +=</div>
-<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160;          sps-&gt;offset_for_ref_frame[i];</div>
-<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;    }</div>
-<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;  }</div>
-<div class="line"><a name="l00674"></a><span class="lineno">  674</span>&#160;</div>
-<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;max_num_ref_frames);</div>
-<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;gaps_in_frame_num_value_allowed_flag);</div>
-<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;</div>
-<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_width_in_mbs_minus1);</div>
-<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_height_in_map_units_minus1);</div>
+<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;  READ_BITS_OR_RETURN(8, &amp;sps-&gt;profile_idc);</div>
+<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set0_flag);</div>
+<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set1_flag);</div>
+<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set2_flag);</div>
+<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set3_flag);</div>
+<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set4_flag);</div>
+<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;constraint_set5_flag);</div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  READ_BITS_OR_RETURN(2, &amp;data);  <span class="comment">// reserved_zero_2bits</span></div>
+<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  READ_BITS_OR_RETURN(8, &amp;sps-&gt;level_idc);</div>
+<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;seq_parameter_set_id);</div>
+<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  TRUE_OR_RETURN(sps-&gt;seq_parameter_set_id &lt; 32);</div>
+<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;</div>
+<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;profile_idc == 100 || sps-&gt;profile_idc == 110 ||</div>
+<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;      sps-&gt;profile_idc == 122 || sps-&gt;profile_idc == 244 ||</div>
+<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;      sps-&gt;profile_idc == 44 || sps-&gt;profile_idc == 83 ||</div>
+<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;      sps-&gt;profile_idc == 86 || sps-&gt;profile_idc == 118 ||</div>
+<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;      sps-&gt;profile_idc == 128) {</div>
+<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;chroma_format_idc);</div>
+<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;    TRUE_OR_RETURN(sps-&gt;chroma_format_idc &lt; 4);</div>
+<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;</div>
+<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;chroma_format_idc == 3)</div>
+<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;      READ_BOOL_OR_RETURN(&amp;sps-&gt;separate_colour_plane_flag);</div>
+<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;</div>
+<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;bit_depth_luma_minus8);</div>
+<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;    TRUE_OR_RETURN(sps-&gt;bit_depth_luma_minus8 &lt; 7);</div>
+<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;</div>
+<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;bit_depth_chroma_minus8);</div>
+<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;    TRUE_OR_RETURN(sps-&gt;bit_depth_chroma_minus8 &lt; 7);</div>
+<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;</div>
+<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;qpprime_y_zero_transform_bypass_flag);</div>
+<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;seq_scaling_matrix_present_flag);</div>
+<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;</div>
+<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;    <span class="keywordflow">if</span> (sps-&gt;seq_scaling_matrix_present_flag) {</div>
+<div class="line"><a name="l00630"></a><span class="lineno">  630</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Scaling matrix present&quot;</span>;</div>
+<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;      res = ParseSpsScalingLists(br, sps.get());</div>
+<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00634"></a><span class="lineno">  634</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;      FillDefaultSeqScalingLists(sps.get());</div>
+<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;    }</div>
+<div class="line"><a name="l00637"></a><span class="lineno">  637</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;    sps-&gt;chroma_format_idc = 1;</div>
+<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;    FillDefaultSeqScalingLists(sps.get());</div>
+<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;  }</div>
+<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;</div>
+<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag)</div>
+<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160;    sps-&gt;chroma_array_type = 0;</div>
+<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;  <span class="keywordflow">else</span></div>
+<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;    sps-&gt;chroma_array_type = sps-&gt;chroma_format_idc;</div>
+<div class="line"><a name="l00646"></a><span class="lineno">  646</span>&#160;</div>
+<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;log2_max_frame_num_minus4);</div>
+<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;  TRUE_OR_RETURN(sps-&gt;log2_max_frame_num_minus4 &lt; 13);</div>
+<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;</div>
+<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_order_cnt_type);</div>
+<div class="line"><a name="l00651"></a><span class="lineno">  651</span>&#160;  TRUE_OR_RETURN(sps-&gt;pic_order_cnt_type &lt; 3);</div>
+<div class="line"><a name="l00652"></a><span class="lineno">  652</span>&#160;</div>
+<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;  sps-&gt;expected_delta_per_pic_order_cnt_cycle = 0;</div>
+<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 0) {</div>
+<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;log2_max_pic_order_cnt_lsb_minus4);</div>
+<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;    TRUE_OR_RETURN(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 &lt; 13);</div>
+<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 1) {</div>
+<div class="line"><a name="l00658"></a><span class="lineno">  658</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;delta_pic_order_always_zero_flag);</div>
+<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;    READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_non_ref_pic);</div>
+<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;    READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_top_to_bottom_field);</div>
+<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;num_ref_frames_in_pic_order_cnt_cycle);</div>
+<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;    TRUE_OR_RETURN(sps-&gt;num_ref_frames_in_pic_order_cnt_cycle &lt; 255);</div>
+<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;</div>
+<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;    <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; sps-&gt;num_ref_frames_in_pic_order_cnt_cycle; ++i) {</div>
+<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;      READ_SE_OR_RETURN(&amp;sps-&gt;offset_for_ref_frame[i]);</div>
+<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;      sps-&gt;expected_delta_per_pic_order_cnt_cycle +=</div>
+<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;          sps-&gt;offset_for_ref_frame[i];</div>
+<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;    }</div>
+<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;  }</div>
+<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;</div>
+<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;max_num_ref_frames);</div>
+<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;gaps_in_frame_num_value_allowed_flag);</div>
+<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;</div>
+<div class="line"><a name="l00674"></a><span class="lineno">  674</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_width_in_mbs_minus1);</div>
+<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;  READ_UE_OR_RETURN(&amp;sps-&gt;pic_height_in_map_units_minus1);</div>
+<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;</div>
+<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;frame_mbs_only_flag);</div>
+<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;  <span class="keywordflow">if</span> (!sps-&gt;frame_mbs_only_flag)</div>
+<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;mb_adaptive_frame_field_flag);</div>
 <div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160;</div>
-<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;frame_mbs_only_flag);</div>
-<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;  <span class="keywordflow">if</span> (!sps-&gt;frame_mbs_only_flag)</div>
-<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;    READ_BOOL_OR_RETURN(&amp;sps-&gt;mb_adaptive_frame_field_flag);</div>
-<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;</div>
-<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;direct_8x8_inference_flag);</div>
-<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;</div>
-<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;frame_cropping_flag);</div>
-<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;frame_cropping_flag) {</div>
-<div class="line"><a name="l00689"></a><span class="lineno">  689</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_left_offset);</div>
-<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_right_offset);</div>
-<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_top_offset);</div>
-<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_bottom_offset);</div>
-<div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160;  }</div>
-<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;</div>
-<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;vui_parameters_present_flag);</div>
-<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;vui_parameters_present_flag) {</div>
-<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;    DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;VUI parameters present&quot;</span>;</div>
-<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;    res = ParseVUIParameters(br, sps.get());</div>
-<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;      <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;  }</div>
+<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;direct_8x8_inference_flag);</div>
+<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;</div>
+<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;frame_cropping_flag);</div>
+<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;frame_cropping_flag) {</div>
+<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_left_offset);</div>
+<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_right_offset);</div>
+<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_top_offset);</div>
+<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;    READ_UE_OR_RETURN(&amp;sps-&gt;frame_crop_bottom_offset);</div>
+<div class="line"><a name="l00689"></a><span class="lineno">  689</span>&#160;  }</div>
+<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;</div>
+<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;  READ_BOOL_OR_RETURN(&amp;sps-&gt;vui_parameters_present_flag);</div>
+<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;vui_parameters_present_flag) {</div>
+<div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160;    DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;VUI parameters present&quot;</span>;</div>
+<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;    res = ParseVUIParameters(br, sps.get());</div>
+<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;      <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;  }</div>
+<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;</div>
+<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;  <span class="comment">// If an SPS with the same id already exists, replace it.</span></div>
+<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;  *sps_id = sps-&gt;seq_parameter_set_id;</div>
+<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;  active_SPSes_[*sps_id] = std::move(sps);</div>
 <div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160;</div>
-<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;  <span class="comment">// If an SPS with the same id already exists, replace it.</span></div>
-<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;  *sps_id = sps-&gt;seq_parameter_set_id;</div>
-<div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160;  <span class="keyword">delete</span> active_SPSes_[*sps_id];</div>
-<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;  active_SPSes_[*sps_id] = sps.release();</div>
-<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;</div>
-<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;}</div>
-<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;</div>
-<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;H264Parser::Result H264Parser::ParsePps(<span class="keyword">const</span> Nalu&amp; nalu, <span class="keywordtype">int</span>* pps_id) {</div>
-<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;  <span class="comment">// See 7.4.2.2.</span></div>
-<div class="line"><a name="l00713"></a><span class="lineno">  713</span>&#160;  <span class="keyword">const</span> H264Sps* sps;</div>
-<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;  Result res;</div>
-<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;  H26xBitReader reader;</div>
-<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
-<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;  H26xBitReader* br = &amp;reader;</div>
-<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;</div>
-<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;  *pps_id = -1;</div>
-<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;</div>
-<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;  std::unique_ptr&lt;H264Pps&gt; pps(<span class="keyword">new</span> H264Pps());</div>
-<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;</div>
-<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;pic_parameter_set_id);</div>
-<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;seq_parameter_set_id);</div>
-<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;  TRUE_OR_RETURN(pps-&gt;seq_parameter_set_id &lt; 32);</div>
-<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;</div>
-<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;  sps = GetSps(pps-&gt;seq_parameter_set_id);</div>
-<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;  TRUE_OR_RETURN(sps);</div>
-<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;</div>
-<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;entropy_coding_mode_flag);</div>
-<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;bottom_field_pic_order_in_frame_present_flag);</div>
-<div class="line"><a name="l00732"></a><span class="lineno">  732</span>&#160;</div>
-<div class="line"><a name="l00733"></a><span class="lineno">  733</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_slice_groups_minus1);</div>
-<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;num_slice_groups_minus1 &gt; 1) {</div>
-<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Slice groups not supported&quot;</span>;</div>
-<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l00737"></a><span class="lineno">  737</span>&#160;  }</div>
-<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;</div>
-<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_ref_idx_l0_default_active_minus1);</div>
-<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;  TRUE_OR_RETURN(pps-&gt;num_ref_idx_l0_default_active_minus1 &lt; 32);</div>
-<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;</div>
-<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_ref_idx_l1_default_active_minus1);</div>
-<div class="line"><a name="l00743"></a><span class="lineno">  743</span>&#160;  TRUE_OR_RETURN(pps-&gt;num_ref_idx_l1_default_active_minus1 &lt; 32);</div>
-<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;</div>
-<div class="line"><a name="l00745"></a><span class="lineno">  745</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;weighted_pred_flag);</div>
-<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;  READ_BITS_OR_RETURN(2, &amp;pps-&gt;weighted_bipred_idc);</div>
-<div class="line"><a name="l00747"></a><span class="lineno">  747</span>&#160;  TRUE_OR_RETURN(pps-&gt;weighted_bipred_idc &lt; 3);</div>
-<div class="line"><a name="l00748"></a><span class="lineno">  748</span>&#160;</div>
-<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;pic_init_qp_minus26);</div>
-<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;pic_init_qp_minus26, -26, 25);</div>
-<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;</div>
-<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;pic_init_qs_minus26);</div>
-<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;pic_init_qs_minus26, -26, 25);</div>
-<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;</div>
-<div class="line"><a name="l00755"></a><span class="lineno">  755</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;chroma_qp_index_offset);</div>
-<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;chroma_qp_index_offset, -12, 12);</div>
-<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;  pps-&gt;second_chroma_qp_index_offset = pps-&gt;chroma_qp_index_offset;</div>
-<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;</div>
-<div class="line"><a name="l00759"></a><span class="lineno">  759</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;deblocking_filter_control_present_flag);</div>
-<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;constrained_intra_pred_flag);</div>
-<div class="line"><a name="l00761"></a><span class="lineno">  761</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;redundant_pic_cnt_present_flag);</div>
-<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;</div>
-<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;  <span class="keywordflow">if</span> (br-&gt;HasMoreRBSPData()) {</div>
-<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;    READ_BOOL_OR_RETURN(&amp;pps-&gt;transform_8x8_mode_flag);</div>
-<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;    READ_BOOL_OR_RETURN(&amp;pps-&gt;pic_scaling_matrix_present_flag);</div>
-<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;</div>
-<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;pic_scaling_matrix_present_flag) {</div>
-<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Picture scaling matrix present&quot;</span>;</div>
-<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;      res = ParsePpsScalingLists(br, *sps, pps.get());</div>
-<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;    }</div>
-<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;</div>
-<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;    READ_SE_OR_RETURN(&amp;pps-&gt;second_chroma_qp_index_offset);</div>
-<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;  }</div>
-<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;</div>
-<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;  <span class="comment">// If a PPS with the same id already exists, replace it.</span></div>
-<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;  *pps_id = pps-&gt;pic_parameter_set_id;</div>
-<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;  <span class="keyword">delete</span> active_PPSes_[*pps_id];</div>
-<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;  active_PPSes_[*pps_id] = pps.release();</div>
-<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;</div>
-<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;}</div>
+<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;}</div>
+<div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160;</div>
+<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;H264Parser::Result H264Parser::ParsePps(<span class="keyword">const</span> Nalu&amp; nalu, <span class="keywordtype">int</span>* pps_id) {</div>
+<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;  <span class="comment">// See 7.4.2.2.</span></div>
+<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;  <span class="keyword">const</span> H264Sps* sps;</div>
+<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;  Result res;</div>
+<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;  H26xBitReader reader;</div>
+<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
+<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;  H26xBitReader* br = &amp;reader;</div>
+<div class="line"><a name="l00713"></a><span class="lineno">  713</span>&#160;</div>
+<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;  *pps_id = -1;</div>
+<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;</div>
+<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;  std::unique_ptr&lt;H264Pps&gt; pps(<span class="keyword">new</span> H264Pps());</div>
+<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;</div>
+<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;pic_parameter_set_id);</div>
+<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;seq_parameter_set_id);</div>
+<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;  TRUE_OR_RETURN(pps-&gt;seq_parameter_set_id &lt; 32);</div>
+<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;</div>
+<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;  sps = GetSps(pps-&gt;seq_parameter_set_id);</div>
+<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;  TRUE_OR_RETURN(sps);</div>
+<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;</div>
+<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;entropy_coding_mode_flag);</div>
+<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;bottom_field_pic_order_in_frame_present_flag);</div>
+<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;</div>
+<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_slice_groups_minus1);</div>
+<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;num_slice_groups_minus1 &gt; 1) {</div>
+<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Slice groups not supported&quot;</span>;</div>
+<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l00732"></a><span class="lineno">  732</span>&#160;  }</div>
+<div class="line"><a name="l00733"></a><span class="lineno">  733</span>&#160;</div>
+<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_ref_idx_l0_default_active_minus1);</div>
+<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;  TRUE_OR_RETURN(pps-&gt;num_ref_idx_l0_default_active_minus1 &lt; 32);</div>
+<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;</div>
+<div class="line"><a name="l00737"></a><span class="lineno">  737</span>&#160;  READ_UE_OR_RETURN(&amp;pps-&gt;num_ref_idx_l1_default_active_minus1);</div>
+<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;  TRUE_OR_RETURN(pps-&gt;num_ref_idx_l1_default_active_minus1 &lt; 32);</div>
+<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160;</div>
+<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;weighted_pred_flag);</div>
+<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;  READ_BITS_OR_RETURN(2, &amp;pps-&gt;weighted_bipred_idc);</div>
+<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;  TRUE_OR_RETURN(pps-&gt;weighted_bipred_idc &lt; 3);</div>
+<div class="line"><a name="l00743"></a><span class="lineno">  743</span>&#160;</div>
+<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;pic_init_qp_minus26);</div>
+<div class="line"><a name="l00745"></a><span class="lineno">  745</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;pic_init_qp_minus26, -26, 25);</div>
+<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;</div>
+<div class="line"><a name="l00747"></a><span class="lineno">  747</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;pic_init_qs_minus26);</div>
+<div class="line"><a name="l00748"></a><span class="lineno">  748</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;pic_init_qs_minus26, -26, 25);</div>
+<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160;</div>
+<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;  READ_SE_OR_RETURN(&amp;pps-&gt;chroma_qp_index_offset);</div>
+<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;  IN_RANGE_OR_RETURN(pps-&gt;chroma_qp_index_offset, -12, 12);</div>
+<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;  pps-&gt;second_chroma_qp_index_offset = pps-&gt;chroma_qp_index_offset;</div>
+<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;</div>
+<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;deblocking_filter_control_present_flag);</div>
+<div class="line"><a name="l00755"></a><span class="lineno">  755</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;constrained_intra_pred_flag);</div>
+<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;  READ_BOOL_OR_RETURN(&amp;pps-&gt;redundant_pic_cnt_present_flag);</div>
+<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;</div>
+<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;  <span class="keywordflow">if</span> (br-&gt;HasMoreRBSPData()) {</div>
+<div class="line"><a name="l00759"></a><span class="lineno">  759</span>&#160;    READ_BOOL_OR_RETURN(&amp;pps-&gt;transform_8x8_mode_flag);</div>
+<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;    READ_BOOL_OR_RETURN(&amp;pps-&gt;pic_scaling_matrix_present_flag);</div>
+<div class="line"><a name="l00761"></a><span class="lineno">  761</span>&#160;</div>
+<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;pic_scaling_matrix_present_flag) {</div>
+<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Picture scaling matrix present&quot;</span>;</div>
+<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;      res = ParsePpsScalingLists(br, *sps, pps.get());</div>
+<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;    }</div>
+<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;</div>
+<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;    READ_SE_OR_RETURN(&amp;pps-&gt;second_chroma_qp_index_offset);</div>
+<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;  }</div>
+<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;</div>
+<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;  <span class="comment">// If a PPS with the same id already exists, replace it.</span></div>
+<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;  *pps_id = pps-&gt;pic_parameter_set_id;</div>
+<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;  active_PPSes_[*pps_id] = std::move(pps);</div>
+<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;</div>
+<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;}</div>
+<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;</div>
+<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;H264Parser::Result H264Parser::ParseRefPicListModification(</div>
+<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;    H26xBitReader* br,</div>
+<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
+<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;    H264ModificationOfPicNum* ref_list_mods) {</div>
+<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;  H264ModificationOfPicNum* pic_num_mod;</div>
 <div class="line"><a name="l00784"></a><span class="lineno">  784</span>&#160;</div>
-<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;H264Parser::Result H264Parser::ParseRefPicListModification(</div>
-<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;    H26xBitReader* br,</div>
-<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
-<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;    H264ModificationOfPicNum* ref_list_mods) {</div>
-<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;  H264ModificationOfPicNum* pic_num_mod;</div>
-<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;</div>
-<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;  <span class="keywordflow">if</span> (num_ref_idx_active_minus1 &gt;= 32)</div>
-<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;    <span class="keywordflow">return</span> kInvalidStream;</div>
-<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;</div>
-<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 32; ++i) {</div>
-<div class="line"><a name="l00795"></a><span class="lineno">  795</span>&#160;    pic_num_mod = &amp;ref_list_mods[i];</div>
-<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;    READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;modification_of_pic_nums_idc);</div>
-<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;    TRUE_OR_RETURN(pic_num_mod-&gt;modification_of_pic_nums_idc &lt; 4);</div>
+<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;  <span class="keywordflow">if</span> (num_ref_idx_active_minus1 &gt;= 32)</div>
+<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;    <span class="keywordflow">return</span> kInvalidStream;</div>
+<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;</div>
+<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; 32; ++i) {</div>
+<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;    pic_num_mod = &amp;ref_list_mods[i];</div>
+<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;    READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;modification_of_pic_nums_idc);</div>
+<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;    TRUE_OR_RETURN(pic_num_mod-&gt;modification_of_pic_nums_idc &lt; 4);</div>
+<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;</div>
+<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;    <span class="keywordflow">switch</span> (pic_num_mod-&gt;modification_of_pic_nums_idc) {</div>
+<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;      <span class="keywordflow">case</span> 0:</div>
+<div class="line"><a name="l00795"></a><span class="lineno">  795</span>&#160;      <span class="keywordflow">case</span> 1:</div>
+<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;        READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;abs_diff_pic_num_minus1);</div>
+<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;        <span class="keywordflow">break</span>;</div>
 <div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160;</div>
-<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;    <span class="keywordflow">switch</span> (pic_num_mod-&gt;modification_of_pic_nums_idc) {</div>
-<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;      <span class="keywordflow">case</span> 0:</div>
-<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;      <span class="keywordflow">case</span> 1:</div>
-<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;        READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;abs_diff_pic_num_minus1);</div>
-<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;</div>
-<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;      <span class="keywordflow">case</span> 2:</div>
-<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;        READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;long_term_pic_num);</div>
-<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;      <span class="keywordflow">case</span> 2:</div>
+<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;        READ_UE_OR_RETURN(&amp;pic_num_mod-&gt;long_term_pic_num);</div>
+<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;        <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;</div>
+<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;      <span class="keywordflow">case</span> 3:</div>
+<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;        <span class="comment">// Per spec, list cannot be empty.</span></div>
+<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;        <span class="keywordflow">if</span> (i == 0)</div>
+<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;          <span class="keywordflow">return</span> kInvalidStream;</div>
+<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;        <span class="keywordflow">return</span> kOk;</div>
 <div class="line"><a name="l00808"></a><span class="lineno">  808</span>&#160;</div>
-<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;      <span class="keywordflow">case</span> 3:</div>
-<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;        <span class="comment">// Per spec, list cannot be empty.</span></div>
-<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;        <span class="keywordflow">if</span> (i == 0)</div>
-<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;          <span class="keywordflow">return</span> kInvalidStream;</div>
-<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;        <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;</div>
-<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;      <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;        <span class="keywordflow">return</span> kInvalidStream;</div>
-<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;    }</div>
-<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;  }</div>
+<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;      <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;        <span class="keywordflow">return</span> kInvalidStream;</div>
+<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;    }</div>
+<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;  }</div>
+<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;</div>
+<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;  <span class="comment">// If we got here, we didn&#39;t get loop end marker prematurely,</span></div>
+<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;  <span class="comment">// so make sure it is there for our client.</span></div>
+<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;  <span class="keywordtype">int</span> modification_of_pic_nums_idc;</div>
+<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;  READ_UE_OR_RETURN(&amp;modification_of_pic_nums_idc);</div>
+<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;  TRUE_OR_RETURN(modification_of_pic_nums_idc == 3);</div>
 <div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;</div>
-<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;  <span class="comment">// If we got here, we didn&#39;t get loop end marker prematurely,</span></div>
-<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;  <span class="comment">// so make sure it is there for our client.</span></div>
-<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;  <span class="keywordtype">int</span> modification_of_pic_nums_idc;</div>
-<div class="line"><a name="l00823"></a><span class="lineno">  823</span>&#160;  READ_UE_OR_RETURN(&amp;modification_of_pic_nums_idc);</div>
-<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;  TRUE_OR_RETURN(modification_of_pic_nums_idc == 3);</div>
-<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;</div>
-<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;}</div>
-<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;</div>
-<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;H264Parser::Result H264Parser::ParseRefPicListModifications(</div>
-<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;    H26xBitReader* br, H264SliceHeader* shdr) {</div>
-<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;  Result res;</div>
-<div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160;</div>
-<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160;  <span class="keywordflow">if</span> (!shdr-&gt;IsISlice() &amp;&amp; !shdr-&gt;IsSISlice()) {</div>
-<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;ref_pic_list_modification_flag_l0);</div>
-<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;ref_pic_list_modification_flag_l0) {</div>
-<div class="line"><a name="l00836"></a><span class="lineno">  836</span>&#160;      res = ParseRefPicListModification(br, shdr-&gt;num_ref_idx_l0_active_minus1,</div>
-<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;                                        shdr-&gt;ref_list_l0_modifications);</div>
-<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00839"></a><span class="lineno">  839</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;    }</div>
-<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;  }</div>
-<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160;</div>
-<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
-<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;ref_pic_list_modification_flag_l1);</div>
-<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;ref_pic_list_modification_flag_l1) {</div>
-<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160;      res = ParseRefPicListModification(br, shdr-&gt;num_ref_idx_l1_active_minus1,</div>
-<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;                                        shdr-&gt;ref_list_l1_modifications);</div>
-<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;        <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;    }</div>
-<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;  }</div>
-<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;</div>
-<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160;}</div>
-<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;</div>
-<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;H264Parser::Result H264Parser::ParseWeightingFactors(</div>
-<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160;    H26xBitReader* br,</div>
-<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
-<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;    <span class="keywordtype">int</span> chroma_array_type,</div>
-<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;    <span class="keywordtype">int</span> luma_log2_weight_denom,</div>
-<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;    <span class="keywordtype">int</span> chroma_log2_weight_denom,</div>
-<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;    H264WeightingFactors* w_facts) {</div>
-<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;  <span class="keywordtype">int</span> def_luma_weight = 1 &lt;&lt; luma_log2_weight_denom;</div>
-<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;  <span class="keywordtype">int</span> def_chroma_weight = 1 &lt;&lt; chroma_log2_weight_denom;</div>
+<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;}</div>
+<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;</div>
+<div class="line"><a name="l00823"></a><span class="lineno">  823</span>&#160;H264Parser::Result H264Parser::ParseRefPicListModifications(</div>
+<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;    H26xBitReader* br, H264SliceHeader* shdr) {</div>
+<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;  Result res;</div>
+<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;</div>
+<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;  <span class="keywordflow">if</span> (!shdr-&gt;IsISlice() &amp;&amp; !shdr-&gt;IsSISlice()) {</div>
+<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;ref_pic_list_modification_flag_l0);</div>
+<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;ref_pic_list_modification_flag_l0) {</div>
+<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;      res = ParseRefPicListModification(br, shdr-&gt;num_ref_idx_l0_active_minus1,</div>
+<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;                                        shdr-&gt;ref_list_l0_modifications);</div>
+<div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;    }</div>
+<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;  }</div>
+<div class="line"><a name="l00836"></a><span class="lineno">  836</span>&#160;</div>
+<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
+<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;ref_pic_list_modification_flag_l1);</div>
+<div class="line"><a name="l00839"></a><span class="lineno">  839</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;ref_pic_list_modification_flag_l1) {</div>
+<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;      res = ParseRefPicListModification(br, shdr-&gt;num_ref_idx_l1_active_minus1,</div>
+<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;                                        shdr-&gt;ref_list_l1_modifications);</div>
+<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160;      <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;        <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;    }</div>
+<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;  }</div>
+<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160;</div>
+<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;}</div>
+<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;</div>
+<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;H264Parser::Result H264Parser::ParseWeightingFactors(</div>
+<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;    H26xBitReader* br,</div>
+<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;    <span class="keywordtype">int</span> num_ref_idx_active_minus1,</div>
+<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;    <span class="keywordtype">int</span> chroma_array_type,</div>
+<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160;    <span class="keywordtype">int</span> luma_log2_weight_denom,</div>
+<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;    <span class="keywordtype">int</span> chroma_log2_weight_denom,</div>
+<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;    H264WeightingFactors* w_facts) {</div>
+<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160;  <span class="keywordtype">int</span> def_luma_weight = 1 &lt;&lt; luma_log2_weight_denom;</div>
+<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;  <span class="keywordtype">int</span> def_chroma_weight = 1 &lt;&lt; chroma_log2_weight_denom;</div>
+<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;</div>
+<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; num_ref_idx_active_minus1 + 1; ++i) {</div>
+<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;    READ_BOOL_OR_RETURN(&amp;w_facts-&gt;luma_weight_flag);</div>
+<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;    <span class="keywordflow">if</span> (w_facts-&gt;luma_weight_flag) {</div>
+<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;      READ_SE_OR_RETURN(&amp;w_facts-&gt;luma_weight[i]);</div>
+<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;      IN_RANGE_OR_RETURN(w_facts-&gt;luma_weight[i], -128, 127);</div>
 <div class="line"><a name="l00865"></a><span class="lineno">  865</span>&#160;</div>
-<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; num_ref_idx_active_minus1 + 1; ++i) {</div>
-<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;    READ_BOOL_OR_RETURN(&amp;w_facts-&gt;luma_weight_flag);</div>
-<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160;    <span class="keywordflow">if</span> (w_facts-&gt;luma_weight_flag) {</div>
-<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;      READ_SE_OR_RETURN(&amp;w_facts-&gt;luma_weight[i]);</div>
-<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;      IN_RANGE_OR_RETURN(w_facts-&gt;luma_weight[i], -128, 127);</div>
-<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;</div>
-<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;      READ_SE_OR_RETURN(&amp;w_facts-&gt;luma_offset[i]);</div>
-<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;      IN_RANGE_OR_RETURN(w_facts-&gt;luma_offset[i], -128, 127);</div>
-<div class="line"><a name="l00874"></a><span class="lineno">  874</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;      w_facts-&gt;luma_weight[i] = def_luma_weight;</div>
-<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;      w_facts-&gt;luma_offset[i] = 0;</div>
-<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;    }</div>
-<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;</div>
-<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;    <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
-<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;      READ_BOOL_OR_RETURN(&amp;w_facts-&gt;chroma_weight_flag);</div>
-<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;      <span class="keywordflow">if</span> (w_facts-&gt;chroma_weight_flag) {</div>
-<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; ++j) {</div>
-<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;          READ_SE_OR_RETURN(&amp;w_facts-&gt;chroma_weight[i][j]);</div>
-<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;          IN_RANGE_OR_RETURN(w_facts-&gt;chroma_weight[i][j], -128, 127);</div>
-<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;</div>
-<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;          READ_SE_OR_RETURN(&amp;w_facts-&gt;chroma_offset[i][j]);</div>
-<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;          IN_RANGE_OR_RETURN(w_facts-&gt;chroma_offset[i][j], -128, 127);</div>
-<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;        }</div>
-<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00890"></a><span class="lineno">  890</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; ++j) {</div>
-<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;          w_facts-&gt;chroma_weight[i][j] = def_chroma_weight;</div>
-<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;          w_facts-&gt;chroma_offset[i][j] = 0;</div>
-<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;        }</div>
-<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;      }</div>
-<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;    }</div>
-<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;  }</div>
-<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;</div>
-<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;}</div>
+<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;      READ_SE_OR_RETURN(&amp;w_facts-&gt;luma_offset[i]);</div>
+<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;      IN_RANGE_OR_RETURN(w_facts-&gt;luma_offset[i], -128, 127);</div>
+<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;      w_facts-&gt;luma_weight[i] = def_luma_weight;</div>
+<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;      w_facts-&gt;luma_offset[i] = 0;</div>
+<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;    }</div>
+<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;</div>
+<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;    <span class="keywordflow">if</span> (chroma_array_type != 0) {</div>
+<div class="line"><a name="l00874"></a><span class="lineno">  874</span>&#160;      READ_BOOL_OR_RETURN(&amp;w_facts-&gt;chroma_weight_flag);</div>
+<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;      <span class="keywordflow">if</span> (w_facts-&gt;chroma_weight_flag) {</div>
+<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; ++j) {</div>
+<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;          READ_SE_OR_RETURN(&amp;w_facts-&gt;chroma_weight[i][j]);</div>
+<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;          IN_RANGE_OR_RETURN(w_facts-&gt;chroma_weight[i][j], -128, 127);</div>
+<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;</div>
+<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;          READ_SE_OR_RETURN(&amp;w_facts-&gt;chroma_offset[i][j]);</div>
+<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;          IN_RANGE_OR_RETURN(w_facts-&gt;chroma_offset[i][j], -128, 127);</div>
+<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;        }</div>
+<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;      } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j &lt; 2; ++j) {</div>
+<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;          w_facts-&gt;chroma_weight[i][j] = def_chroma_weight;</div>
+<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;          w_facts-&gt;chroma_offset[i][j] = 0;</div>
+<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;        }</div>
+<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;      }</div>
+<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;    }</div>
+<div class="line"><a name="l00890"></a><span class="lineno">  890</span>&#160;  }</div>
+<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;</div>
+<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;}</div>
+<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;</div>
+<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;H264Parser::Result H264Parser::ParsePredWeightTable(H26xBitReader* br,</div>
+<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;                                                    <span class="keyword">const</span> H264Sps&amp; sps,</div>
+<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;                                                    H264SliceHeader* shdr) {</div>
+<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;luma_log2_weight_denom);</div>
+<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;  TRUE_OR_RETURN(shdr-&gt;luma_log2_weight_denom &lt; 8);</div>
 <div class="line"><a name="l00900"></a><span class="lineno">  900</span>&#160;</div>
-<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;H264Parser::Result H264Parser::ParsePredWeightTable(H26xBitReader* br,</div>
-<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;                                                    <span class="keyword">const</span> H264Sps&amp; sps,</div>
-<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;                                                    H264SliceHeader* shdr) {</div>
-<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;luma_log2_weight_denom);</div>
-<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;  TRUE_OR_RETURN(shdr-&gt;luma_log2_weight_denom &lt; 8);</div>
-<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;</div>
-<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;  <span class="keywordflow">if</span> (sps.chroma_array_type != 0)</div>
-<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;chroma_log2_weight_denom);</div>
-<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;  TRUE_OR_RETURN(shdr-&gt;chroma_log2_weight_denom &lt; 8);</div>
-<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;</div>
-<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;  Result res = ParseWeightingFactors(br,</div>
-<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;                                     shdr-&gt;num_ref_idx_l0_active_minus1,</div>
-<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;                                     sps.chroma_array_type,</div>
-<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;                                     shdr-&gt;luma_log2_weight_denom,</div>
-<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;                                     shdr-&gt;chroma_log2_weight_denom,</div>
-<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;                                     &amp;shdr-&gt;pred_weight_table_l0);</div>
-<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00918"></a><span class="lineno">  918</span>&#160;    <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;</div>
-<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
-<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;    res = ParseWeightingFactors(br,</div>
-<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;                                shdr-&gt;num_ref_idx_l1_active_minus1,</div>
-<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;                                sps.chroma_array_type,</div>
-<div class="line"><a name="l00924"></a><span class="lineno">  924</span>&#160;                                shdr-&gt;luma_log2_weight_denom,</div>
-<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;                                shdr-&gt;chroma_log2_weight_denom,</div>
-<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;                                &amp;shdr-&gt;pred_weight_table_l1);</div>
-<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;      <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;  }</div>
-<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;</div>
-<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;}</div>
-<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;</div>
-<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;H264Parser::Result H264Parser::ParseDecRefPicMarking(H26xBitReader* br,</div>
-<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;                                                     H264SliceHeader* shdr) {</div>
-<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;idr_pic_flag) {</div>
-<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;no_output_of_prior_pics_flag);</div>
-<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;long_term_reference_flag);</div>
-<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;adaptive_ref_pic_marking_mode_flag);</div>
+<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;  <span class="keywordflow">if</span> (sps.chroma_array_type != 0)</div>
+<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;chroma_log2_weight_denom);</div>
+<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;  TRUE_OR_RETURN(shdr-&gt;chroma_log2_weight_denom &lt; 8);</div>
+<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;</div>
+<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;  Result res = ParseWeightingFactors(br,</div>
+<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;                                     shdr-&gt;num_ref_idx_l0_active_minus1,</div>
+<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;                                     sps.chroma_array_type,</div>
+<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;                                     shdr-&gt;luma_log2_weight_denom,</div>
+<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;                                     shdr-&gt;chroma_log2_weight_denom,</div>
+<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;                                     &amp;shdr-&gt;pred_weight_table_l0);</div>
+<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;  <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;    <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;</div>
+<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
+<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;    res = ParseWeightingFactors(br,</div>
+<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;                                shdr-&gt;num_ref_idx_l1_active_minus1,</div>
+<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;                                sps.chroma_array_type,</div>
+<div class="line"><a name="l00918"></a><span class="lineno">  918</span>&#160;                                shdr-&gt;luma_log2_weight_denom,</div>
+<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;                                shdr-&gt;chroma_log2_weight_denom,</div>
+<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;                                &amp;shdr-&gt;pred_weight_table_l1);</div>
+<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;      <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;  }</div>
+<div class="line"><a name="l00924"></a><span class="lineno">  924</span>&#160;</div>
+<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;}</div>
+<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;</div>
+<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;H264Parser::Result H264Parser::ParseDecRefPicMarking(H26xBitReader* br,</div>
+<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;                                                     H264SliceHeader* shdr) {</div>
+<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;idr_pic_flag) {</div>
+<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;no_output_of_prior_pics_flag);</div>
+<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;long_term_reference_flag);</div>
+<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;adaptive_ref_pic_marking_mode_flag);</div>
+<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;</div>
+<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;    H264DecRefPicMarking* marking;</div>
+<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;adaptive_ref_pic_marking_mode_flag) {</div>
+<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;      <span class="keywordtype">size_t</span> i;</div>
+<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;      <span class="keywordflow">for</span> (i = 0; i &lt; arraysize(shdr-&gt;ref_pic_marking); ++i) {</div>
+<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;        marking = &amp;shdr-&gt;ref_pic_marking[i];</div>
 <div class="line"><a name="l00941"></a><span class="lineno">  941</span>&#160;</div>
-<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;    H264DecRefPicMarking* marking;</div>
-<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;adaptive_ref_pic_marking_mode_flag) {</div>
-<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;      <span class="keywordtype">size_t</span> i;</div>
-<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;      <span class="keywordflow">for</span> (i = 0; i &lt; arraysize(shdr-&gt;ref_pic_marking); ++i) {</div>
-<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;        marking = &amp;shdr-&gt;ref_pic_marking[i];</div>
-<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;</div>
-<div class="line"><a name="l00948"></a><span class="lineno">  948</span>&#160;        READ_UE_OR_RETURN(&amp;marking-&gt;memory_mgmnt_control_operation);</div>
-<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 0)</div>
-<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;          <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;</div>
-<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 1 ||</div>
-<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;            marking-&gt;memory_mgmnt_control_operation == 3)</div>
-<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;difference_of_pic_nums_minus1);</div>
-<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;</div>
-<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 2)</div>
-<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;long_term_pic_num);</div>
-<div class="line"><a name="l00958"></a><span class="lineno">  958</span>&#160;</div>
-<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 3 ||</div>
-<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;            marking-&gt;memory_mgmnt_control_operation == 6)</div>
-<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;long_term_frame_idx);</div>
-<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;</div>
-<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 4)</div>
-<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;max_long_term_frame_idx_plus1);</div>
-<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;</div>
-<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation &gt; 6)</div>
-<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;          <span class="keywordflow">return</span> kInvalidStream;</div>
-<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;      }</div>
-<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;</div>
-<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;      <span class="keywordflow">if</span> (i == arraysize(shdr-&gt;ref_pic_marking)) {</div>
-<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;        DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Ran out of dec ref pic marking fields&quot;</span>;</div>
-<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;        <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;      }</div>
-<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;    }</div>
-<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;  }</div>
-<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;</div>
-<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;}</div>
-<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;</div>
-<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;H264Parser::Result H264Parser::ParseSliceHeader(<span class="keyword">const</span> Nalu&amp; nalu,</div>
-<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;                                                H264SliceHeader* shdr) {</div>
-<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;  <span class="comment">// See 7.4.3.</span></div>
-<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;  <span class="keyword">const</span> H264Sps* sps;</div>
-<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;  <span class="keyword">const</span> H264Pps* pps;</div>
-<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;  Result res;</div>
-<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;  H26xBitReader reader;</div>
-<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
-<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;  H26xBitReader* br = &amp;reader;</div>
-<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;</div>
-<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;  memset(shdr, 0, <span class="keyword">sizeof</span>(*shdr));</div>
-<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;</div>
-<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;  shdr-&gt;idr_pic_flag = (nalu.type() == 5);</div>
-<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;  shdr-&gt;nal_ref_idc = nalu.ref_idc();</div>
-<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;  shdr-&gt;nalu_data = nalu.data() + nalu.header_size();</div>
-<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;  shdr-&gt;nalu_size = nalu.payload_size();</div>
+<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;        READ_UE_OR_RETURN(&amp;marking-&gt;memory_mgmnt_control_operation);</div>
+<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 0)</div>
+<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;          <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;</div>
+<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 1 ||</div>
+<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;            marking-&gt;memory_mgmnt_control_operation == 3)</div>
+<div class="line"><a name="l00948"></a><span class="lineno">  948</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;difference_of_pic_nums_minus1);</div>
+<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;</div>
+<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 2)</div>
+<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;long_term_pic_num);</div>
+<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;</div>
+<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 3 ||</div>
+<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;            marking-&gt;memory_mgmnt_control_operation == 6)</div>
+<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;long_term_frame_idx);</div>
+<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;</div>
+<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation == 4)</div>
+<div class="line"><a name="l00958"></a><span class="lineno">  958</span>&#160;          READ_UE_OR_RETURN(&amp;marking-&gt;max_long_term_frame_idx_plus1);</div>
+<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;</div>
+<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;        <span class="keywordflow">if</span> (marking-&gt;memory_mgmnt_control_operation &gt; 6)</div>
+<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;          <span class="keywordflow">return</span> kInvalidStream;</div>
+<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;      }</div>
+<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;</div>
+<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;      <span class="keywordflow">if</span> (i == arraysize(shdr-&gt;ref_pic_marking)) {</div>
+<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;        DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Ran out of dec ref pic marking fields&quot;</span>;</div>
+<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;        <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;      }</div>
+<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;    }</div>
+<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;  }</div>
+<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;</div>
+<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;}</div>
+<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;</div>
+<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;H264Parser::Result H264Parser::ParseSliceHeader(<span class="keyword">const</span> Nalu&amp; nalu,</div>
+<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;                                                H264SliceHeader* shdr) {</div>
+<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;  <span class="comment">// See 7.4.3.</span></div>
+<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;  <span class="keyword">const</span> H264Sps* sps;</div>
+<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;  <span class="keyword">const</span> H264Pps* pps;</div>
+<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;  Result res;</div>
+<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;  H26xBitReader reader;</div>
+<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
+<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;  H26xBitReader* br = &amp;reader;</div>
+<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;</div>
+<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;  memset(shdr, 0, <span class="keyword">sizeof</span>(*shdr));</div>
+<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;</div>
+<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;  shdr-&gt;idr_pic_flag = (nalu.type() == 5);</div>
+<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;  shdr-&gt;nal_ref_idc = nalu.ref_idc();</div>
+<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;  shdr-&gt;nalu_data = nalu.data() + nalu.header_size();</div>
+<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;  shdr-&gt;nalu_size = nalu.payload_size();</div>
+<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;</div>
+<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;first_mb_in_slice);</div>
+<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;slice_type);</div>
+<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;  TRUE_OR_RETURN(shdr-&gt;slice_type &lt; 10);</div>
+<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;</div>
+<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;pic_parameter_set_id);</div>
 <div class="line"><a name="l00996"></a><span class="lineno">  996</span>&#160;</div>
-<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;first_mb_in_slice);</div>
-<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;slice_type);</div>
-<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;  TRUE_OR_RETURN(shdr-&gt;slice_type &lt; 10);</div>
-<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;</div>
-<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;  READ_UE_OR_RETURN(&amp;shdr-&gt;pic_parameter_set_id);</div>
+<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;  pps = GetPps(shdr-&gt;pic_parameter_set_id);</div>
+<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;  TRUE_OR_RETURN(pps);</div>
+<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;</div>
+<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;  sps = GetSps(pps-&gt;seq_parameter_set_id);</div>
+<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;  TRUE_OR_RETURN(sps);</div>
 <div class="line"><a name="l01002"></a><span class="lineno"> 1002</span>&#160;</div>
-<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;  pps = GetPps(shdr-&gt;pic_parameter_set_id);</div>
-<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;  TRUE_OR_RETURN(pps);</div>
-<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;</div>
-<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;  sps = GetSps(pps-&gt;seq_parameter_set_id);</div>
-<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;  TRUE_OR_RETURN(sps);</div>
-<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;</div>
-<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag) {</div>
-<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Interlaced streams not supported&quot;</span>;</div>
-<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;  }</div>
-<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;</div>
-<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;  READ_BITS_OR_RETURN(sps-&gt;log2_max_frame_num_minus4 + 4, &amp;shdr-&gt;frame_num);</div>
-<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;  <span class="keywordflow">if</span> (!sps-&gt;frame_mbs_only_flag) {</div>
-<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;field_pic_flag);</div>
-<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;field_pic_flag) {</div>
-<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Interlaced streams not supported&quot;</span>;</div>
-<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;      <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;    }</div>
-<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;  }</div>
-<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;</div>
-<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;idr_pic_flag)</div>
-<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;idr_pic_id);</div>
-<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;</div>
-<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 0) {</div>
-<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;    READ_BITS_OR_RETURN(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
-<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;                        &amp;shdr-&gt;pic_order_cnt_lsb);</div>
-<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;bottom_field_pic_order_in_frame_present_flag &amp;&amp;</div>
-<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;        !shdr-&gt;field_pic_flag)</div>
-<div class="line"><a name="l01031"></a><span class="lineno"> 1031</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt_bottom);</div>
-<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;  }</div>
-<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;</div>
-<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 1 &amp;&amp; !sps-&gt;delta_pic_order_always_zero_flag) {</div>
-<div class="line"><a name="l01035"></a><span class="lineno"> 1035</span>&#160;    READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt[0]);</div>
-<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;bottom_field_pic_order_in_frame_present_flag &amp;&amp;</div>
-<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;        !shdr-&gt;field_pic_flag)</div>
-<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt[1]);</div>
-<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;  }</div>
-<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;</div>
-<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;redundant_pic_cnt_present_flag) {</div>
-<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;redundant_pic_cnt);</div>
-<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;    TRUE_OR_RETURN(shdr-&gt;redundant_pic_cnt &lt; 128);</div>
-<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;  }</div>
-<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;</div>
-<div class="line"><a name="l01046"></a><span class="lineno"> 1046</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice())</div>
-<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;direct_spatial_mv_pred_flag);</div>
-<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;</div>
-<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsPSlice() || shdr-&gt;IsSPSlice() || shdr-&gt;IsBSlice()) {</div>
-<div class="line"><a name="l01050"></a><span class="lineno"> 1050</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;num_ref_idx_active_override_flag);</div>
-<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;num_ref_idx_active_override_flag) {</div>
-<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;      READ_UE_OR_RETURN(&amp;shdr-&gt;num_ref_idx_l0_active_minus1);</div>
-<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;      <span class="keywordflow">if</span> (shdr-&gt;IsBSlice())</div>
-<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;        READ_UE_OR_RETURN(&amp;shdr-&gt;num_ref_idx_l1_active_minus1);</div>
-<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;      shdr-&gt;num_ref_idx_l0_active_minus1 =</div>
-<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;          pps-&gt;num_ref_idx_l0_default_active_minus1;</div>
-<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;      <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
-<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;        shdr-&gt;num_ref_idx_l1_active_minus1 =</div>
-<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;            pps-&gt;num_ref_idx_l1_default_active_minus1;</div>
-<div class="line"><a name="l01061"></a><span class="lineno"> 1061</span>&#160;      }</div>
-<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;    }</div>
-<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;  }</div>
-<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;field_pic_flag) {</div>
-<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l0_active_minus1 &lt; 32);</div>
-<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l1_active_minus1 &lt; 32);</div>
-<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l0_active_minus1 &lt; 16);</div>
-<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l1_active_minus1 &lt; 16);</div>
-<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;  }</div>
-<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;</div>
-<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;  <span class="keywordflow">if</span> (nalu.type() == Nalu::H264_CodedSliceExtension) {</div>
-<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;    res = ParseRefPicListModifications(br, shdr);</div>
-<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;      <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;  }</div>
-<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;</div>
-<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;  <span class="keywordflow">if</span> ((pps-&gt;weighted_pred_flag &amp;&amp; (shdr-&gt;IsPSlice() || shdr-&gt;IsSPSlice())) ||</div>
-<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;      (pps-&gt;weighted_bipred_idc == 1 &amp;&amp; shdr-&gt;IsBSlice())) {</div>
-<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;    res = ParsePredWeightTable(br, *sps, shdr);</div>
+<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;separate_colour_plane_flag) {</div>
+<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Interlaced streams not supported&quot;</span>;</div>
+<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;  }</div>
+<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;</div>
+<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;  READ_BITS_OR_RETURN(sps-&gt;log2_max_frame_num_minus4 + 4, &amp;shdr-&gt;frame_num);</div>
+<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;  <span class="keywordflow">if</span> (!sps-&gt;frame_mbs_only_flag) {</div>
+<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;field_pic_flag);</div>
+<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;field_pic_flag) {</div>
+<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Interlaced streams not supported&quot;</span>;</div>
+<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;      <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;    }</div>
+<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;  }</div>
+<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;</div>
+<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;idr_pic_flag)</div>
+<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;idr_pic_id);</div>
+<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;</div>
+<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 0) {</div>
+<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;    READ_BITS_OR_RETURN(sps-&gt;log2_max_pic_order_cnt_lsb_minus4 + 4,</div>
+<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;                        &amp;shdr-&gt;pic_order_cnt_lsb);</div>
+<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;bottom_field_pic_order_in_frame_present_flag &amp;&amp;</div>
+<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;        !shdr-&gt;field_pic_flag)</div>
+<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt_bottom);</div>
+<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;  }</div>
+<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;</div>
+<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;  <span class="keywordflow">if</span> (sps-&gt;pic_order_cnt_type == 1 &amp;&amp; !sps-&gt;delta_pic_order_always_zero_flag) {</div>
+<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;    READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt[0]);</div>
+<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;    <span class="keywordflow">if</span> (pps-&gt;bottom_field_pic_order_in_frame_present_flag &amp;&amp;</div>
+<div class="line"><a name="l01031"></a><span class="lineno"> 1031</span>&#160;        !shdr-&gt;field_pic_flag)</div>
+<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;delta_pic_order_cnt[1]);</div>
+<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;  }</div>
+<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;</div>
+<div class="line"><a name="l01035"></a><span class="lineno"> 1035</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;redundant_pic_cnt_present_flag) {</div>
+<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;redundant_pic_cnt);</div>
+<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;    TRUE_OR_RETURN(shdr-&gt;redundant_pic_cnt &lt; 128);</div>
+<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;  }</div>
+<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;</div>
+<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsBSlice())</div>
+<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;direct_spatial_mv_pred_flag);</div>
+<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;</div>
+<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsPSlice() || shdr-&gt;IsSPSlice() || shdr-&gt;IsBSlice()) {</div>
+<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;    READ_BOOL_OR_RETURN(&amp;shdr-&gt;num_ref_idx_active_override_flag);</div>
+<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;num_ref_idx_active_override_flag) {</div>
+<div class="line"><a name="l01046"></a><span class="lineno"> 1046</span>&#160;      READ_UE_OR_RETURN(&amp;shdr-&gt;num_ref_idx_l0_active_minus1);</div>
+<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;      <span class="keywordflow">if</span> (shdr-&gt;IsBSlice())</div>
+<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;        READ_UE_OR_RETURN(&amp;shdr-&gt;num_ref_idx_l1_active_minus1);</div>
+<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l01050"></a><span class="lineno"> 1050</span>&#160;      shdr-&gt;num_ref_idx_l0_active_minus1 =</div>
+<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;          pps-&gt;num_ref_idx_l0_default_active_minus1;</div>
+<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;      <span class="keywordflow">if</span> (shdr-&gt;IsBSlice()) {</div>
+<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;        shdr-&gt;num_ref_idx_l1_active_minus1 =</div>
+<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;            pps-&gt;num_ref_idx_l1_default_active_minus1;</div>
+<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;      }</div>
+<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;    }</div>
+<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;  }</div>
+<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;field_pic_flag) {</div>
+<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l0_active_minus1 &lt; 32);</div>
+<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l1_active_minus1 &lt; 32);</div>
+<div class="line"><a name="l01061"></a><span class="lineno"> 1061</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l0_active_minus1 &lt; 16);</div>
+<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;    TRUE_OR_RETURN(shdr-&gt;num_ref_idx_l1_active_minus1 &lt; 16);</div>
+<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;  }</div>
+<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;</div>
+<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;  <span class="keywordflow">if</span> (nalu.type() == Nalu::H264_CodedSliceExtension) {</div>
+<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;    res = ParseRefPicListModifications(br, shdr);</div>
+<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;      <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;  }</div>
+<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;</div>
+<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;  <span class="keywordflow">if</span> ((pps-&gt;weighted_pred_flag &amp;&amp; (shdr-&gt;IsPSlice() || shdr-&gt;IsSPSlice())) ||</div>
+<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;      (pps-&gt;weighted_bipred_idc == 1 &amp;&amp; shdr-&gt;IsBSlice())) {</div>
+<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;    res = ParsePredWeightTable(br, *sps, shdr);</div>
+<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
+<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;      <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;  }</div>
+<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;</div>
+<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;  <span class="keywordflow">if</span> (nalu.ref_idc() != 0) {</div>
+<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;    res = ParseDecRefPicMarking(br, shdr);</div>
 <div class="line"><a name="l01083"></a><span class="lineno"> 1083</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
 <div class="line"><a name="l01084"></a><span class="lineno"> 1084</span>&#160;      <span class="keywordflow">return</span> res;</div>
 <div class="line"><a name="l01085"></a><span class="lineno"> 1085</span>&#160;  }</div>
 <div class="line"><a name="l01086"></a><span class="lineno"> 1086</span>&#160;</div>
-<div class="line"><a name="l01087"></a><span class="lineno"> 1087</span>&#160;  <span class="keywordflow">if</span> (nalu.ref_idc() != 0) {</div>
-<div class="line"><a name="l01088"></a><span class="lineno"> 1088</span>&#160;    res = ParseDecRefPicMarking(br, shdr);</div>
-<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;    <span class="keywordflow">if</span> (res != kOk)</div>
-<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;      <span class="keywordflow">return</span> res;</div>
+<div class="line"><a name="l01087"></a><span class="lineno"> 1087</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;entropy_coding_mode_flag &amp;&amp; !shdr-&gt;IsISlice() &amp;&amp;</div>
+<div class="line"><a name="l01088"></a><span class="lineno"> 1088</span>&#160;      !shdr-&gt;IsSISlice()) {</div>
+<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;cabac_init_idc);</div>
+<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;    TRUE_OR_RETURN(shdr-&gt;cabac_init_idc &lt; 3);</div>
 <div class="line"><a name="l01091"></a><span class="lineno"> 1091</span>&#160;  }</div>
 <div class="line"><a name="l01092"></a><span class="lineno"> 1092</span>&#160;</div>
-<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;entropy_coding_mode_flag &amp;&amp; !shdr-&gt;IsISlice() &amp;&amp;</div>
-<div class="line"><a name="l01094"></a><span class="lineno"> 1094</span>&#160;      !shdr-&gt;IsSISlice()) {</div>
-<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;cabac_init_idc);</div>
-<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;    TRUE_OR_RETURN(shdr-&gt;cabac_init_idc &lt; 3);</div>
-<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;  }</div>
-<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160;</div>
-<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;  READ_SE_OR_RETURN(&amp;shdr-&gt;slice_qp_delta);</div>
+<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;  READ_SE_OR_RETURN(&amp;shdr-&gt;slice_qp_delta);</div>
+<div class="line"><a name="l01094"></a><span class="lineno"> 1094</span>&#160;</div>
+<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsSPSlice() || shdr-&gt;IsSISlice()) {</div>
+<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;IsSPSlice())</div>
+<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;      READ_BOOL_OR_RETURN(&amp;shdr-&gt;sp_for_switch_flag);</div>
+<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160;    READ_SE_OR_RETURN(&amp;shdr-&gt;slice_qs_delta);</div>
+<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;  }</div>
 <div class="line"><a name="l01100"></a><span class="lineno"> 1100</span>&#160;</div>
-<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;  <span class="keywordflow">if</span> (shdr-&gt;IsSPSlice() || shdr-&gt;IsSISlice()) {</div>
-<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;IsSPSlice())</div>
-<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;      READ_BOOL_OR_RETURN(&amp;shdr-&gt;sp_for_switch_flag);</div>
-<div class="line"><a name="l01104"></a><span class="lineno"> 1104</span>&#160;    READ_SE_OR_RETURN(&amp;shdr-&gt;slice_qs_delta);</div>
-<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;  }</div>
-<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;</div>
-<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_control_present_flag) {</div>
-<div class="line"><a name="l01108"></a><span class="lineno"> 1108</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;disable_deblocking_filter_idc);</div>
-<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;    TRUE_OR_RETURN(shdr-&gt;disable_deblocking_filter_idc &lt; 3);</div>
-<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;</div>
-<div class="line"><a name="l01111"></a><span class="lineno"> 1111</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;disable_deblocking_filter_idc != 1) {</div>
-<div class="line"><a name="l01112"></a><span class="lineno"> 1112</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;slice_alpha_c0_offset_div2);</div>
-<div class="line"><a name="l01113"></a><span class="lineno"> 1113</span>&#160;      IN_RANGE_OR_RETURN(shdr-&gt;slice_alpha_c0_offset_div2, -6, 6);</div>
-<div class="line"><a name="l01114"></a><span class="lineno"> 1114</span>&#160;</div>
-<div class="line"><a name="l01115"></a><span class="lineno"> 1115</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;slice_beta_offset_div2);</div>
-<div class="line"><a name="l01116"></a><span class="lineno"> 1116</span>&#160;      IN_RANGE_OR_RETURN(shdr-&gt;slice_beta_offset_div2, -6, 6);</div>
-<div class="line"><a name="l01117"></a><span class="lineno"> 1117</span>&#160;    }</div>
-<div class="line"><a name="l01118"></a><span class="lineno"> 1118</span>&#160;  }</div>
-<div class="line"><a name="l01119"></a><span class="lineno"> 1119</span>&#160;</div>
-<div class="line"><a name="l01120"></a><span class="lineno"> 1120</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;num_slice_groups_minus1 &gt; 0) {</div>
-<div class="line"><a name="l01121"></a><span class="lineno"> 1121</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Slice groups not supported&quot;</span>;</div>
-<div class="line"><a name="l01122"></a><span class="lineno"> 1122</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
-<div class="line"><a name="l01123"></a><span class="lineno"> 1123</span>&#160;  }</div>
+<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;deblocking_filter_control_present_flag) {</div>
+<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;    READ_UE_OR_RETURN(&amp;shdr-&gt;disable_deblocking_filter_idc);</div>
+<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;    TRUE_OR_RETURN(shdr-&gt;disable_deblocking_filter_idc &lt; 3);</div>
+<div class="line"><a name="l01104"></a><span class="lineno"> 1104</span>&#160;</div>
+<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;    <span class="keywordflow">if</span> (shdr-&gt;disable_deblocking_filter_idc != 1) {</div>
+<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;slice_alpha_c0_offset_div2);</div>
+<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;      IN_RANGE_OR_RETURN(shdr-&gt;slice_alpha_c0_offset_div2, -6, 6);</div>
+<div class="line"><a name="l01108"></a><span class="lineno"> 1108</span>&#160;</div>
+<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;      READ_SE_OR_RETURN(&amp;shdr-&gt;slice_beta_offset_div2);</div>
+<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;      IN_RANGE_OR_RETURN(shdr-&gt;slice_beta_offset_div2, -6, 6);</div>
+<div class="line"><a name="l01111"></a><span class="lineno"> 1111</span>&#160;    }</div>
+<div class="line"><a name="l01112"></a><span class="lineno"> 1112</span>&#160;  }</div>
+<div class="line"><a name="l01113"></a><span class="lineno"> 1113</span>&#160;</div>
+<div class="line"><a name="l01114"></a><span class="lineno"> 1114</span>&#160;  <span class="keywordflow">if</span> (pps-&gt;num_slice_groups_minus1 &gt; 0) {</div>
+<div class="line"><a name="l01115"></a><span class="lineno"> 1115</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Slice groups not supported&quot;</span>;</div>
+<div class="line"><a name="l01116"></a><span class="lineno"> 1116</span>&#160;    <span class="keywordflow">return</span> kUnsupportedStream;</div>
+<div class="line"><a name="l01117"></a><span class="lineno"> 1117</span>&#160;  }</div>
+<div class="line"><a name="l01118"></a><span class="lineno"> 1118</span>&#160;</div>
+<div class="line"><a name="l01119"></a><span class="lineno"> 1119</span>&#160;  <span class="keywordtype">size_t</span> epb = br-&gt;NumEmulationPreventionBytesRead();</div>
+<div class="line"><a name="l01120"></a><span class="lineno"> 1120</span>&#160;  shdr-&gt;header_bit_size = (shdr-&gt;nalu_size - epb) * 8 - br-&gt;NumBitsLeft();</div>
+<div class="line"><a name="l01121"></a><span class="lineno"> 1121</span>&#160;</div>
+<div class="line"><a name="l01122"></a><span class="lineno"> 1122</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01123"></a><span class="lineno"> 1123</span>&#160;}</div>
 <div class="line"><a name="l01124"></a><span class="lineno"> 1124</span>&#160;</div>
-<div class="line"><a name="l01125"></a><span class="lineno"> 1125</span>&#160;  <span class="keywordtype">size_t</span> epb = br-&gt;NumEmulationPreventionBytesRead();</div>
-<div class="line"><a name="l01126"></a><span class="lineno"> 1126</span>&#160;  shdr-&gt;header_bit_size = (shdr-&gt;nalu_size - epb) * 8 - br-&gt;NumBitsLeft();</div>
-<div class="line"><a name="l01127"></a><span class="lineno"> 1127</span>&#160;</div>
-<div class="line"><a name="l01128"></a><span class="lineno"> 1128</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01129"></a><span class="lineno"> 1129</span>&#160;}</div>
-<div class="line"><a name="l01130"></a><span class="lineno"> 1130</span>&#160;</div>
-<div class="line"><a name="l01131"></a><span class="lineno"> 1131</span>&#160;H264Parser::Result H264Parser::ParseSEI(<span class="keyword">const</span> Nalu&amp; nalu,</div>
-<div class="line"><a name="l01132"></a><span class="lineno"> 1132</span>&#160;                                        H264SEIMessage* sei_msg) {</div>
-<div class="line"><a name="l01133"></a><span class="lineno"> 1133</span>&#160;  <span class="keywordtype">int</span> byte;</div>
-<div class="line"><a name="l01134"></a><span class="lineno"> 1134</span>&#160;  H26xBitReader reader;</div>
-<div class="line"><a name="l01135"></a><span class="lineno"> 1135</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
-<div class="line"><a name="l01136"></a><span class="lineno"> 1136</span>&#160;  H26xBitReader* br = &amp;reader;</div>
-<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;</div>
-<div class="line"><a name="l01138"></a><span class="lineno"> 1138</span>&#160;  memset(sei_msg, 0, <span class="keyword">sizeof</span>(*sei_msg));</div>
-<div class="line"><a name="l01139"></a><span class="lineno"> 1139</span>&#160;</div>
-<div class="line"><a name="l01140"></a><span class="lineno"> 1140</span>&#160;  READ_BITS_OR_RETURN(8, &amp;byte);</div>
-<div class="line"><a name="l01141"></a><span class="lineno"> 1141</span>&#160;  <span class="keywordflow">while</span> (byte == 0xff) {</div>
-<div class="line"><a name="l01142"></a><span class="lineno"> 1142</span>&#160;    sei_msg-&gt;type += 255;</div>
-<div class="line"><a name="l01143"></a><span class="lineno"> 1143</span>&#160;    READ_BITS_OR_RETURN(8, &amp;byte);</div>
-<div class="line"><a name="l01144"></a><span class="lineno"> 1144</span>&#160;  }</div>
-<div class="line"><a name="l01145"></a><span class="lineno"> 1145</span>&#160;  sei_msg-&gt;type += byte;</div>
-<div class="line"><a name="l01146"></a><span class="lineno"> 1146</span>&#160;</div>
-<div class="line"><a name="l01147"></a><span class="lineno"> 1147</span>&#160;  READ_BITS_OR_RETURN(8, &amp;byte);</div>
-<div class="line"><a name="l01148"></a><span class="lineno"> 1148</span>&#160;  <span class="keywordflow">while</span> (byte == 0xff) {</div>
-<div class="line"><a name="l01149"></a><span class="lineno"> 1149</span>&#160;    sei_msg-&gt;payload_size += 255;</div>
-<div class="line"><a name="l01150"></a><span class="lineno"> 1150</span>&#160;    READ_BITS_OR_RETURN(8, &amp;byte);</div>
-<div class="line"><a name="l01151"></a><span class="lineno"> 1151</span>&#160;  }</div>
-<div class="line"><a name="l01152"></a><span class="lineno"> 1152</span>&#160;  sei_msg-&gt;payload_size += byte;</div>
-<div class="line"><a name="l01153"></a><span class="lineno"> 1153</span>&#160;</div>
-<div class="line"><a name="l01154"></a><span class="lineno"> 1154</span>&#160;  DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Found SEI message type: &quot;</span> &lt;&lt; sei_msg-&gt;type</div>
-<div class="line"><a name="l01155"></a><span class="lineno"> 1155</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; payload size: &quot;</span> &lt;&lt; sei_msg-&gt;payload_size;</div>
-<div class="line"><a name="l01156"></a><span class="lineno"> 1156</span>&#160;</div>
-<div class="line"><a name="l01157"></a><span class="lineno"> 1157</span>&#160;  <span class="keywordflow">switch</span> (sei_msg-&gt;type) {</div>
-<div class="line"><a name="l01158"></a><span class="lineno"> 1158</span>&#160;    <span class="keywordflow">case</span> H264SEIMessage::kSEIRecoveryPoint:</div>
-<div class="line"><a name="l01159"></a><span class="lineno"> 1159</span>&#160;      READ_UE_OR_RETURN(&amp;sei_msg-&gt;recovery_point.recovery_frame_cnt);</div>
-<div class="line"><a name="l01160"></a><span class="lineno"> 1160</span>&#160;      READ_BOOL_OR_RETURN(&amp;sei_msg-&gt;recovery_point.exact_match_flag);</div>
-<div class="line"><a name="l01161"></a><span class="lineno"> 1161</span>&#160;      READ_BOOL_OR_RETURN(&amp;sei_msg-&gt;recovery_point.broken_link_flag);</div>
-<div class="line"><a name="l01162"></a><span class="lineno"> 1162</span>&#160;      READ_BITS_OR_RETURN(2, &amp;sei_msg-&gt;recovery_point.changing_slice_group_idc);</div>
-<div class="line"><a name="l01163"></a><span class="lineno"> 1163</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l01164"></a><span class="lineno"> 1164</span>&#160;</div>
-<div class="line"><a name="l01165"></a><span class="lineno"> 1165</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l01166"></a><span class="lineno"> 1166</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Unsupported SEI message&quot;</span>;</div>
-<div class="line"><a name="l01167"></a><span class="lineno"> 1167</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l01168"></a><span class="lineno"> 1168</span>&#160;  }</div>
-<div class="line"><a name="l01169"></a><span class="lineno"> 1169</span>&#160;</div>
-<div class="line"><a name="l01170"></a><span class="lineno"> 1170</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
-<div class="line"><a name="l01171"></a><span class="lineno"> 1171</span>&#160;}</div>
-<div class="line"><a name="l01172"></a><span class="lineno"> 1172</span>&#160;</div>
-<div class="line"><a name="l01173"></a><span class="lineno"> 1173</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l01174"></a><span class="lineno"> 1174</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l01125"></a><span class="lineno"> 1125</span>&#160;H264Parser::Result H264Parser::ParseSEI(<span class="keyword">const</span> Nalu&amp; nalu,</div>
+<div class="line"><a name="l01126"></a><span class="lineno"> 1126</span>&#160;                                        H264SEIMessage* sei_msg) {</div>
+<div class="line"><a name="l01127"></a><span class="lineno"> 1127</span>&#160;  <span class="keywordtype">int</span> byte;</div>
+<div class="line"><a name="l01128"></a><span class="lineno"> 1128</span>&#160;  H26xBitReader reader;</div>
+<div class="line"><a name="l01129"></a><span class="lineno"> 1129</span>&#160;  reader.Initialize(nalu.data() + nalu.header_size(), nalu.payload_size());</div>
+<div class="line"><a name="l01130"></a><span class="lineno"> 1130</span>&#160;  H26xBitReader* br = &amp;reader;</div>
+<div class="line"><a name="l01131"></a><span class="lineno"> 1131</span>&#160;</div>
+<div class="line"><a name="l01132"></a><span class="lineno"> 1132</span>&#160;  memset(sei_msg, 0, <span class="keyword">sizeof</span>(*sei_msg));</div>
+<div class="line"><a name="l01133"></a><span class="lineno"> 1133</span>&#160;</div>
+<div class="line"><a name="l01134"></a><span class="lineno"> 1134</span>&#160;  READ_BITS_OR_RETURN(8, &amp;byte);</div>
+<div class="line"><a name="l01135"></a><span class="lineno"> 1135</span>&#160;  <span class="keywordflow">while</span> (byte == 0xff) {</div>
+<div class="line"><a name="l01136"></a><span class="lineno"> 1136</span>&#160;    sei_msg-&gt;type += 255;</div>
+<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;    READ_BITS_OR_RETURN(8, &amp;byte);</div>
+<div class="line"><a name="l01138"></a><span class="lineno"> 1138</span>&#160;  }</div>
+<div class="line"><a name="l01139"></a><span class="lineno"> 1139</span>&#160;  sei_msg-&gt;type += byte;</div>
+<div class="line"><a name="l01140"></a><span class="lineno"> 1140</span>&#160;</div>
+<div class="line"><a name="l01141"></a><span class="lineno"> 1141</span>&#160;  READ_BITS_OR_RETURN(8, &amp;byte);</div>
+<div class="line"><a name="l01142"></a><span class="lineno"> 1142</span>&#160;  <span class="keywordflow">while</span> (byte == 0xff) {</div>
+<div class="line"><a name="l01143"></a><span class="lineno"> 1143</span>&#160;    sei_msg-&gt;payload_size += 255;</div>
+<div class="line"><a name="l01144"></a><span class="lineno"> 1144</span>&#160;    READ_BITS_OR_RETURN(8, &amp;byte);</div>
+<div class="line"><a name="l01145"></a><span class="lineno"> 1145</span>&#160;  }</div>
+<div class="line"><a name="l01146"></a><span class="lineno"> 1146</span>&#160;  sei_msg-&gt;payload_size += byte;</div>
+<div class="line"><a name="l01147"></a><span class="lineno"> 1147</span>&#160;</div>
+<div class="line"><a name="l01148"></a><span class="lineno"> 1148</span>&#160;  DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Found SEI message type: &quot;</span> &lt;&lt; sei_msg-&gt;type</div>
+<div class="line"><a name="l01149"></a><span class="lineno"> 1149</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; payload size: &quot;</span> &lt;&lt; sei_msg-&gt;payload_size;</div>
+<div class="line"><a name="l01150"></a><span class="lineno"> 1150</span>&#160;</div>
+<div class="line"><a name="l01151"></a><span class="lineno"> 1151</span>&#160;  <span class="keywordflow">switch</span> (sei_msg-&gt;type) {</div>
+<div class="line"><a name="l01152"></a><span class="lineno"> 1152</span>&#160;    <span class="keywordflow">case</span> H264SEIMessage::kSEIRecoveryPoint:</div>
+<div class="line"><a name="l01153"></a><span class="lineno"> 1153</span>&#160;      READ_UE_OR_RETURN(&amp;sei_msg-&gt;recovery_point.recovery_frame_cnt);</div>
+<div class="line"><a name="l01154"></a><span class="lineno"> 1154</span>&#160;      READ_BOOL_OR_RETURN(&amp;sei_msg-&gt;recovery_point.exact_match_flag);</div>
+<div class="line"><a name="l01155"></a><span class="lineno"> 1155</span>&#160;      READ_BOOL_OR_RETURN(&amp;sei_msg-&gt;recovery_point.broken_link_flag);</div>
+<div class="line"><a name="l01156"></a><span class="lineno"> 1156</span>&#160;      READ_BITS_OR_RETURN(2, &amp;sei_msg-&gt;recovery_point.changing_slice_group_idc);</div>
+<div class="line"><a name="l01157"></a><span class="lineno"> 1157</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l01158"></a><span class="lineno"> 1158</span>&#160;</div>
+<div class="line"><a name="l01159"></a><span class="lineno"> 1159</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l01160"></a><span class="lineno"> 1160</span>&#160;      DVLOG(4) &lt;&lt; <span class="stringliteral">&quot;Unsupported SEI message&quot;</span>;</div>
+<div class="line"><a name="l01161"></a><span class="lineno"> 1161</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l01162"></a><span class="lineno"> 1162</span>&#160;  }</div>
+<div class="line"><a name="l01163"></a><span class="lineno"> 1163</span>&#160;</div>
+<div class="line"><a name="l01164"></a><span class="lineno"> 1164</span>&#160;  <span class="keywordflow">return</span> kOk;</div>
+<div class="line"><a name="l01165"></a><span class="lineno"> 1165</span>&#160;}</div>
+<div class="line"><a name="l01166"></a><span class="lineno"> 1166</span>&#160;</div>
+<div class="line"><a name="l01167"></a><span class="lineno"> 1167</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l01168"></a><span class="lineno"> 1168</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d86/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor-members.html b/docs/dc/d86/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor-members.html
index 30648c30d8..28b9c8c9cc 100644
--- a/docs/dc/d86/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor-members.html
+++ b/docs/dc/d86/structshaka_1_1media_1_1mp4_1_1ElementaryStreamDescriptor-members.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/d8f/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader.html b/docs/dc/d8f/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader.html
index 538ee5c440..a25f47122b 100644
--- a/docs/dc/d8f/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader.html
+++ b/docs/dc/d8f/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/da0/structshaka_1_1media_1_1mp4_1_1DTSSpecific.html b/docs/dc/da0/structshaka_1_1media_1_1mp4_1_1DTSSpecific.html
index dc9d2e3228..8bbc674a97 100644
--- a/docs/dc/da0/structshaka_1_1media_1_1mp4_1_1DTSSpecific.html
+++ b/docs/dc/da0/structshaka_1_1media_1_1mp4_1_1DTSSpecific.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/da1/classshaka_1_1MpdBuilder.html b/docs/dc/da1/classshaka_1_1MpdBuilder.html
index 5fecd304f1..77905e68bd 100644
--- a/docs/dc/da1/classshaka_1_1MpdBuilder.html
+++ b/docs/dc/da1/classshaka_1_1MpdBuilder.html
@@ -151,7 +151,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>This class generates DASH MPDs (Media Presentation Descriptions). </p>
 
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00058">58</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00057">57</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ad22c1e62affefcb33382c9480820c032"></a>
 <div class="memitem">
@@ -219,7 +219,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>The new adaptation set, which is owned by this instance. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00413">413</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00412">412</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -244,7 +244,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00409">409</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00408">408</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -288,7 +288,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00646">646</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00643">643</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -322,7 +322,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00428">428</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00427">427</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -348,7 +348,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>The mpd type. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00093">93</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00092">92</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 
 </div>
 </div>
@@ -374,7 +374,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00423">423</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l00422">422</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -385,7 +385,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>DynamicMpdBuilderTes
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html b/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html
index a78833825a..609bc102f1 100644
--- a/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html
+++ b/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html
@@ -208,7 +208,7 @@ Static Public Attributes</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dbd/structshaka_1_1media_1_1FileCloser-members.html b/docs/dc/dbd/structshaka_1_1media_1_1FileCloser-members.html
index 91b5bcc2be..d574eba856 100644
--- a/docs/dc/dbd/structshaka_1_1media_1_1FileCloser-members.html
+++ b/docs/dc/dbd/structshaka_1_1media_1_1FileCloser-members.html
@@ -97,7 +97,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dbf/box__buffer_8h_source.html b/docs/dc/dbf/box__buffer_8h_source.html
index 48ca3fa391..6838d0a589 100644
--- a/docs/dc/dbf/box__buffer_8h_source.html
+++ b/docs/dc/dbf/box__buffer_8h_source.html
@@ -294,7 +294,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dc1/classshaka_1_1xml_1_1RepresentationXmlNode-members.html b/docs/dc/dc1/classshaka_1_1xml_1_1RepresentationXmlNode-members.html
index 39c260ac89..6b4519ba17 100644
--- a/docs/dc/dc1/classshaka_1_1xml_1_1RepresentationXmlNode-members.html
+++ b/docs/dc/dc1/classshaka_1_1xml_1_1RepresentationXmlNode-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dca/classshaka_1_1media_1_1WebMListParser.html b/docs/dc/dca/classshaka_1_1media_1_1WebMListParser.html
index 947869c022..4e94c27922 100644
--- a/docs/dc/dca/classshaka_1_1media_1_1WebMListParser.html
+++ b/docs/dc/dca/classshaka_1_1media_1_1WebMListParser.html
@@ -210,7 +210,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dd9/rsa__key_8cc_source.html b/docs/dc/dd9/rsa__key_8cc_source.html
index ce20a258ba..fd01f67daf 100644
--- a/docs/dc/dd9/rsa__key_8cc_source.html
+++ b/docs/dc/dd9/rsa__key_8cc_source.html
@@ -114,243 +114,233 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;packager/base/sha1.h&quot;</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kPssSaltLength = 20u;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="comment">// Serialize rsa key from DER encoded PKCS#1 RSAPrivateKey.</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;RSA* DeserializeRsaKey(<span class="keyword">const</span> std::string&amp; serialized_key,</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;                       <span class="keywordtype">bool</span> deserialize_private_key) {</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordflow">if</span> (serialized_key.empty()) {</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Serialized RSA Key is empty.&quot;</span>;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  }</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  BIO* bio = BIO_new_mem_buf(const_cast&lt;char*&gt;(serialized_key.data()),</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                             serialized_key.size());</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordflow">if</span> (bio == NULL) {</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;BIO_new_mem_buf returned NULL.&quot;</span>;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  }</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  RSA* rsa_key = deserialize_private_key ? d2i_RSAPrivateKey_bio(bio, NULL)</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                                         : d2i_RSAPublicKey_bio(bio, NULL);</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  BIO_free(bio);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;}</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;RSA* DeserializeRsaPrivateKey(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  RSA* rsa_key = DeserializeRsaKey(serialized_key, <span class="keyword">true</span>);</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordflow">if</span> (!rsa_key) {</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Private RSA key deserialization failure.&quot;</span>;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  }</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordflow">if</span> (RSA_check_key(rsa_key) != 1) {</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid RSA Private key: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;                                                     ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    RSA_free(rsa_key);</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  }</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;}</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;RSA* DeserializeRsaPublicKey(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  RSA* rsa_key = DeserializeRsaKey(serialized_key, <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">if</span> (!rsa_key) {</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Private RSA key deserialization failure.&quot;</span>;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  }</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">if</span> (RSA_size(rsa_key) &lt;= 0) {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid RSA Public key: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;                                                    ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    RSA_free(rsa_key);</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  }</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;}</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;RsaPrivateKey::RsaPrivateKey(RSA* rsa_key) : rsa_key_(rsa_key) {</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  DCHECK(rsa_key);</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;}</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;RsaPrivateKey::~RsaPrivateKey() {</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keywordflow">if</span> (rsa_key_ != NULL)</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    RSA_free(rsa_key_);</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;}</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div>
-<div class="line"><a name="l00097"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">   97</a></span>&#160;<a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">RsaPrivateKey</a>* <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">RsaPrivateKey::Create</a>(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  RSA* rsa_key = DeserializeRsaPrivateKey(serialized_key);</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordflow">return</span> rsa_key == NULL ? NULL : <span class="keyword">new</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">RsaPrivateKey</a>(rsa_key);</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;}</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;</div>
-<div class="line"><a name="l00102"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">  102</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">RsaPrivateKey::Decrypt</a>(<span class="keyword">const</span> std::string&amp; encrypted_message,</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;                            std::string* decrypted_message) {</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  DCHECK(decrypted_message);</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordflow">if</span> (encrypted_message.size() != rsa_size) {</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Encrypted RSA message has the wrong size (expected &quot;</span></div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;               &lt;&lt; rsa_size &lt;&lt; <span class="stringliteral">&quot;, actual &quot;</span> &lt;&lt; encrypted_message.size() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  }</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  decrypted_message-&gt;resize(rsa_size);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="keywordtype">int</span> decrypted_size = RSA_private_decrypt(</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      rsa_size,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      reinterpret_cast&lt;const uint8_t*&gt;(encrypted_message.data()),</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;      reinterpret_cast&lt;uint8_t*&gt;(string_as_array(decrypted_message)),</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;      rsa_key_,</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;      RSA_PKCS1_OAEP_PADDING);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordflow">if</span> (decrypted_size == -1) {</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA private decrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;                                                         ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  }</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  decrypted_message-&gt;resize(decrypted_size);</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;}</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;</div>
-<div class="line"><a name="l00130"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">  130</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">RsaPrivateKey::GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;                                      std::string* signature) {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  DCHECK(signature);</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  <span class="keywordflow">if</span> (message.empty()) {</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message to be signed is empty.&quot;</span>;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  }</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  std::string message_digest = base::SHA1HashString(message);</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="comment">// Add PSS padding.</span></div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  std::vector&lt;uint8_t&gt; padded_digest(rsa_size);</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keywordflow">if</span> (!RSA_padding_add_PKCS1_PSS_mgf1(</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;          rsa_key_,</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;          &amp;padded_digest[0],</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;          reinterpret_cast&lt;uint8_t*&gt;(string_as_array(&amp;message_digest)),</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;          EVP_sha1(),</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;          EVP_sha1(),</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;          kPssSaltLength)) {</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA padding failure: &quot;</span> &lt;&lt; ERR_error_string(ERR_get_error(),</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;                                                              NULL);</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  }</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">const</span> <span class="keywordtype">size_t</span> kPssSaltLength = 20u;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="comment">// Serialize rsa key from DER encoded PKCS#1 RSAPrivateKey.</span></div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;RSA* DeserializeRsaKey(<span class="keyword">const</span> std::string&amp; serialized_key,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                       <span class="keywordtype">bool</span> deserialize_private_key) {</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordflow">if</span> (serialized_key.empty()) {</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Serialized RSA Key is empty.&quot;</span>;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  }</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  BIO* bio = BIO_new_mem_buf(const_cast&lt;char*&gt;(serialized_key.data()),</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                             serialized_key.size());</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordflow">if</span> (bio == NULL) {</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;BIO_new_mem_buf returned NULL.&quot;</span>;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  }</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  RSA* rsa_key = deserialize_private_key ? d2i_RSAPrivateKey_bio(bio, NULL)</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                         : d2i_RSAPublicKey_bio(bio, NULL);</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  BIO_free(bio);</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;RSA* DeserializeRsaPrivateKey(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  RSA* rsa_key = DeserializeRsaKey(serialized_key, <span class="keyword">true</span>);</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordflow">if</span> (!rsa_key) {</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Private RSA key deserialization failure.&quot;</span>;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  }</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordflow">if</span> (RSA_check_key(rsa_key) != 1) {</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid RSA Private key: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;                                                     ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    RSA_free(rsa_key);</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  }</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;}</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;RSA* DeserializeRsaPublicKey(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  RSA* rsa_key = DeserializeRsaKey(serialized_key, <span class="keyword">false</span>);</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">if</span> (!rsa_key) {</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Private RSA key deserialization failure.&quot;</span>;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  }</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordflow">if</span> (RSA_size(rsa_key) &lt;= 0) {</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid RSA Public key: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;                                                    ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    RSA_free(rsa_key);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  }</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordflow">return</span> rsa_key;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;}</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;RsaPrivateKey::RsaPrivateKey(RSA* rsa_key) : rsa_key_(rsa_key) {</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  DCHECK(rsa_key);</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;RsaPrivateKey::~RsaPrivateKey() {</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordflow">if</span> (rsa_key_ != NULL)</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    RSA_free(rsa_key_);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;}</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
+<div class="line"><a name="l00096"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">   96</a></span>&#160;<a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">RsaPrivateKey</a>* <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">RsaPrivateKey::Create</a>(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  RSA* rsa_key = DeserializeRsaPrivateKey(serialized_key);</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordflow">return</span> rsa_key == NULL ? NULL : <span class="keyword">new</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">RsaPrivateKey</a>(rsa_key);</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;}</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
+<div class="line"><a name="l00101"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">  101</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">RsaPrivateKey::Decrypt</a>(<span class="keyword">const</span> std::string&amp; encrypted_message,</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                            std::string* decrypted_message) {</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  DCHECK(decrypted_message);</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordflow">if</span> (encrypted_message.size() != rsa_size) {</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Encrypted RSA message has the wrong size (expected &quot;</span></div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;               &lt;&lt; rsa_size &lt;&lt; <span class="stringliteral">&quot;, actual &quot;</span> &lt;&lt; encrypted_message.size() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  }</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  decrypted_message-&gt;resize(rsa_size);</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordtype">int</span> decrypted_size = RSA_private_decrypt(</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;      rsa_size, reinterpret_cast&lt;const uint8_t*&gt;(encrypted_message.data()),</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      reinterpret_cast&lt;uint8_t*&gt;(&amp;(*decrypted_message)[0]), rsa_key_,</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      RSA_PKCS1_OAEP_PADDING);</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <span class="keywordflow">if</span> (decrypted_size == -1) {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA private decrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;                                                         ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  }</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  decrypted_message-&gt;resize(decrypted_size);</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;}</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
+<div class="line"><a name="l00127"></a><span class="lineno"><a class="line" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">  127</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">RsaPrivateKey::GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;                                      std::string* signature) {</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  DCHECK(signature);</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordflow">if</span> (message.empty()) {</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message to be signed is empty.&quot;</span>;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  }</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  std::string message_digest = base::SHA1HashString(message);</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="comment">// Add PSS padding.</span></div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  std::vector&lt;uint8_t&gt; padded_digest(rsa_size);</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordflow">if</span> (!RSA_padding_add_PKCS1_PSS_mgf1(</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;          rsa_key_, &amp;padded_digest[0],</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;          reinterpret_cast&lt;uint8_t*&gt;(&amp;message_digest[0]), EVP_sha1(),</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;          EVP_sha1(), kPssSaltLength)) {</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA padding failure: &quot;</span> &lt;&lt; ERR_error_string(ERR_get_error(),</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;                                                              NULL);</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  }</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="comment">// Encrypt PSS padded digest.</span></div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  signature-&gt;resize(rsa_size);</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="keywordtype">int</span> signature_size = RSA_private_encrypt(</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      padded_digest.size(), &amp;padded_digest[0],</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      <span class="keyword">reinterpret_cast&lt;</span>uint8_t*<span class="keyword">&gt;</span>(&amp;(*signature)[0]), rsa_key_, RSA_NO_PADDING);</div>
 <div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="comment">// Encrypt PSS padded digest.</span></div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  signature-&gt;resize(rsa_size);</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  <span class="keywordtype">int</span> signature_size = RSA_private_encrypt(</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;      padded_digest.size(),</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;      &amp;padded_digest[0],</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      <span class="keyword">reinterpret_cast&lt;</span>uint8_t*<span class="keyword">&gt;</span>(string_as_array(signature)),</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;      rsa_key_,</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;      RSA_NO_PADDING);</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="keywordflow">if</span> (signature_size != static_cast&lt;int&gt;(rsa_size)) {</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA private encrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;                                                         ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  }</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;}</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;RsaPublicKey::RsaPublicKey(RSA* rsa_key) : rsa_key_(rsa_key) {</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  DCHECK(rsa_key);</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">if</span> (signature_size != static_cast&lt;int&gt;(rsa_size)) {</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA private encrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;                                                         ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  }</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;}</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;RsaPublicKey::RsaPublicKey(RSA* rsa_key) : rsa_key_(rsa_key) {</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  DCHECK(rsa_key);</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;}</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;RsaPublicKey::~RsaPublicKey() {</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordflow">if</span> (rsa_key_ != NULL)</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    RSA_free(rsa_key_);</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;}</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;</div>
+<div class="line"><a name="l00171"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">  171</a></span>&#160;<a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">RsaPublicKey</a>* <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">RsaPublicKey::Create</a>(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  RSA* rsa_key = DeserializeRsaPublicKey(serialized_key);</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="keywordflow">return</span> rsa_key == NULL ? NULL : <span class="keyword">new</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">RsaPublicKey</a>(rsa_key);</div>
 <div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;}</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;RsaPublicKey::~RsaPublicKey() {</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  <span class="keywordflow">if</span> (rsa_key_ != NULL)</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    RSA_free(rsa_key_);</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;}</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;</div>
-<div class="line"><a name="l00180"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">  180</a></span>&#160;<a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">RsaPublicKey</a>* <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">RsaPublicKey::Create</a>(<span class="keyword">const</span> std::string&amp; serialized_key) {</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  RSA* rsa_key = DeserializeRsaPublicKey(serialized_key);</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordflow">return</span> rsa_key == NULL ? NULL : <span class="keyword">new</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">RsaPublicKey</a>(rsa_key);</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;}</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
-<div class="line"><a name="l00185"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">  185</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">RsaPublicKey::Encrypt</a>(<span class="keyword">const</span> std::string&amp; clear_message,</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;                           std::string* encrypted_message) {</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  DCHECK(encrypted_message);</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="keywordflow">if</span> (clear_message.empty()) {</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message to be encrypted is empty.&quot;</span>;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  }</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  encrypted_message-&gt;resize(rsa_size);</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="keywordtype">int</span> encrypted_size = RSA_public_encrypt(</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;      clear_message.size(),</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;      <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span>uint8_t*<span class="keyword">&gt;</span>(clear_message.data()),</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;      reinterpret_cast&lt;uint8_t*&gt;(string_as_array(encrypted_message)),</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;      rsa_key_,</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;      RSA_PKCS1_OAEP_PADDING);</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="keywordflow">if</span> (encrypted_size != static_cast&lt;int&gt;(rsa_size)) {</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA public encrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;                                                        ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  }</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;}</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
-<div class="line"><a name="l00210"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">  210</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">RsaPublicKey::VerifySignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;                                   <span class="keyword">const</span> std::string&amp; signature) {</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="keywordflow">if</span> (message.empty()) {</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Signed message is empty.&quot;</span>;</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  }</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  <span class="keywordflow">if</span> (signature.size() != rsa_size) {</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message signature is of the wrong size (expected &quot;</span></div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;               &lt;&lt; rsa_size &lt;&lt; <span class="stringliteral">&quot;, actual &quot;</span> &lt;&lt; signature.size() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  }</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="comment">// Decrypt the signature.</span></div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  std::vector&lt;uint8_t&gt; padded_digest(signature.size());</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;  <span class="keywordtype">int</span> decrypted_size =</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;      RSA_public_decrypt(signature.size(),</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;                         <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span>uint8_t*<span class="keyword">&gt;</span>(signature.data()),</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;                         &amp;padded_digest[0],</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;                         rsa_key_,</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;                         RSA_NO_PADDING);</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keywordflow">if</span> (decrypted_size != static_cast&lt;int&gt;(rsa_size)) {</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA public decrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;                                                        ERR_get_error(), NULL);</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  }</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  std::string message_digest = base::SHA1HashString(message);</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
+<div class="line"><a name="l00176"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">  176</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">RsaPublicKey::Encrypt</a>(<span class="keyword">const</span> std::string&amp; clear_message,</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;                           std::string* encrypted_message) {</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  DCHECK(encrypted_message);</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">if</span> (clear_message.empty()) {</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message to be encrypted is empty.&quot;</span>;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  }</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  encrypted_message-&gt;resize(rsa_size);</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordtype">int</span> encrypted_size =</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;      RSA_public_encrypt(clear_message.size(),</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;                         <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span>uint8_t*<span class="keyword">&gt;</span>(clear_message.data()),</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;                         reinterpret_cast&lt;uint8_t*&gt;(&amp;(*encrypted_message)[0]),</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;                         rsa_key_, RSA_PKCS1_OAEP_PADDING);</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="keywordflow">if</span> (encrypted_size != static_cast&lt;int&gt;(rsa_size)) {</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA public encrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;                                                        ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  }</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;}</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div>
+<div class="line"><a name="l00200"></a><span class="lineno"><a class="line" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">  200</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">RsaPublicKey::VerifySignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;                                   <span class="keyword">const</span> std::string&amp; signature) {</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;  <span class="keywordflow">if</span> (message.empty()) {</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Signed message is empty.&quot;</span>;</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  }</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordtype">size_t</span> rsa_size = RSA_size(rsa_key_);</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <span class="keywordflow">if</span> (signature.size() != rsa_size) {</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Message signature is of the wrong size (expected &quot;</span></div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;               &lt;&lt; rsa_size &lt;&lt; <span class="stringliteral">&quot;, actual &quot;</span> &lt;&lt; signature.size() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  }</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="comment">// Decrypt the signature.</span></div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  std::vector&lt;uint8_t&gt; padded_digest(signature.size());</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  <span class="keywordtype">int</span> decrypted_size =</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;      RSA_public_decrypt(signature.size(),</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;                         <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span>uint8_t*<span class="keyword">&gt;</span>(signature.data()),</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;                         &amp;padded_digest[0],</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;                         rsa_key_,</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;                         RSA_NO_PADDING);</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  <span class="keywordflow">if</span> (decrypted_size != static_cast&lt;int&gt;(rsa_size)) {</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;RSA public decrypt failure: &quot;</span> &lt;&lt; ERR_error_string(</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;                                                        ERR_get_error(), NULL);</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  }</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  std::string message_digest = base::SHA1HashString(message);</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  <span class="comment">// Verify PSS padding.</span></div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;  <span class="keywordflow">return</span> RSA_verify_PKCS1_PSS_mgf1(</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;             rsa_key_,</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;             reinterpret_cast&lt;const uint8_t*&gt;(message_digest.data()),</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;             EVP_sha1(),</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;             EVP_sha1(),</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;             &amp;padded_digest[0],</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;             kPssSaltLength) != 0;</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;}</div>
 <div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;  <span class="comment">// Verify PSS padding.</span></div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  <span class="keywordflow">return</span> RSA_verify_PKCS1_PSS_mgf1(</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;             rsa_key_,</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;             reinterpret_cast&lt;const uint8_t*&gt;(message_digest.data()),</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;             EVP_sha1(),</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;             EVP_sha1(),</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;             &amp;padded_digest[0],</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;             kPssSaltLength) != 0;</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;}</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html">shaka::media::RsaPublicKey</a></div><div class="ttdoc">Rsa public key, used for signature verification and encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dcf/rsa__key_8h_source.html#l00053">rsa_key.h:53</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_ab9dcf591f3235b8f4eaa02886f9845e3"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">shaka::media::RsaPublicKey::Encrypt</a></div><div class="ttdeci">bool Encrypt(const std::string &amp;clear_message, std::string *encrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00185">rsa_key.cc:185</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_a89a475ffe2d96bfab09536b864038ca4"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">shaka::media::RsaPrivateKey::Decrypt</a></div><div class="ttdeci">bool Decrypt(const std::string &amp;encrypted_message, std::string *decrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00102">rsa_key.cc:102</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_ab9dcf591f3235b8f4eaa02886f9845e3"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3">shaka::media::RsaPublicKey::Encrypt</a></div><div class="ttdeci">bool Encrypt(const std::string &amp;clear_message, std::string *encrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00176">rsa_key.cc:176</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_a89a475ffe2d96bfab09536b864038ca4"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#a89a475ffe2d96bfab09536b864038ca4">shaka::media::RsaPrivateKey::Decrypt</a></div><div class="ttdeci">bool Decrypt(const std::string &amp;encrypted_message, std::string *decrypted_message)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00101">rsa_key.cc:101</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html">shaka::media::RsaPrivateKey</a></div><div class="ttdoc">Rsa private key, used for message signing and decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dcf/rsa__key_8h_source.html#l00024">rsa_key.h:24</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_a146cc97c8fcacadde1b08c373b766fe4"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">shaka::media::RsaPublicKey::VerifySignature</a></div><div class="ttdeci">bool VerifySignature(const std::string &amp;message, const std::string &amp;signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00210">rsa_key.cc:210</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_aabe4a2f1541ca1e741305f58329e3881"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey::Create</a></div><div class="ttdeci">static RsaPublicKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00180">rsa_key.cc:180</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_ad05d8951dfe3a8af754490022e95e5f2"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">shaka::media::RsaPrivateKey::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00130">rsa_key.cc:130</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00097">rsa_key.cc:97</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_a146cc97c8fcacadde1b08c373b766fe4"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#a146cc97c8fcacadde1b08c373b766fe4">shaka::media::RsaPublicKey::VerifySignature</a></div><div class="ttdeci">bool VerifySignature(const std::string &amp;message, const std::string &amp;signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00200">rsa_key.cc:200</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPublicKey_html_aabe4a2f1541ca1e741305f58329e3881"><div class="ttname"><a href="../../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey::Create</a></div><div class="ttdeci">static RsaPublicKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00171">rsa_key.cc:171</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_ad05d8951dfe3a8af754490022e95e5f2"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#ad05d8951dfe3a8af754490022e95e5f2">shaka::media::RsaPrivateKey::GenerateSignature</a></div><div class="ttdeci">bool GenerateSignature(const std::string &amp;message, std::string *signature)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00127">rsa_key.cc:127</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaPrivateKey_html_aef45d0014d7971b936ce3d0109935ba8"><div class="ttname"><a href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">shaka::media::RsaPrivateKey::Create</a></div><div class="ttdeci">static RsaPrivateKey * Create(const std::string &amp;serialized_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/dd9/rsa__key_8cc_source.html#l00096">rsa_key.cc:96</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/ddf/structshaka_1_1media_1_1mp4_1_1Media.html b/docs/dc/ddf/structshaka_1_1media_1_1mp4_1_1Media.html
index ace8071ab3..11a306dd90 100644
--- a/docs/dc/ddf/structshaka_1_1media_1_1mp4_1_1Media.html
+++ b/docs/dc/ddf/structshaka_1_1media_1_1mp4_1_1Media.html
@@ -179,7 +179,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/ddf/udp__file__posix_8cc_source.html b/docs/dc/ddf/udp__file__posix_8cc_source.html
index 0c6a81a4e9..cefc257aaf 100644
--- a/docs/dc/ddf/udp__file__posix_8cc_source.html
+++ b/docs/dc/ddf/udp__file__posix_8cc_source.html
@@ -322,7 +322,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/de1/structshaka_1_1SegmentInfo.html b/docs/dc/de1/structshaka_1_1SegmentInfo.html
index acfa0b1255..9c73555353 100644
--- a/docs/dc/de1/structshaka_1_1SegmentInfo.html
+++ b/docs/dc/de1/structshaka_1_1SegmentInfo.html
@@ -118,7 +118,7 @@ uint64_t&#160;</td><td class="memItemRight" valign="bottom"><b>repeat</b></td></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/deb/classshaka_1_1media_1_1mp4_1_1Fragmenter-members.html b/docs/dc/deb/classshaka_1_1media_1_1mp4_1_1Fragmenter-members.html
index e5e612cc4c..2a5ba7fbe7 100644
--- a/docs/dc/deb/classshaka_1_1media_1_1mp4_1_1Fragmenter-members.html
+++ b/docs/dc/deb/classshaka_1_1media_1_1mp4_1_1Fragmenter-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/deb/h265__byte__to__unit__stream__converter_8h_source.html b/docs/dc/deb/h265__byte__to__unit__stream__converter_8h_source.html
index 013264e56c..06146037d9 100644
--- a/docs/dc/deb/h265__byte__to__unit__stream__converter_8h_source.html
+++ b/docs/dc/deb/h265__byte__to__unit__stream__converter_8h_source.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/dec/ts__section__pmt_8cc_source.html b/docs/dc/dec/ts__section__pmt_8cc_source.html
index 254f2cb831..565c9b6300 100644
--- a/docs/dc/dec/ts__section__pmt_8cc_source.html
+++ b/docs/dc/dec/ts__section__pmt_8cc_source.html
@@ -207,7 +207,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df0/classshaka_1_1media_1_1ClosureThread.html b/docs/dc/df0/classshaka_1_1media_1_1ClosureThread.html
index 6852ea2db8..6d108fdc97 100644
--- a/docs/dc/df0/classshaka_1_1media_1_1ClosureThread.html
+++ b/docs/dc/df0/classshaka_1_1media_1_1ClosureThread.html
@@ -179,7 +179,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html b/docs/dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html
index 9c9d416015..7e64ef94fc 100644
--- a/docs/dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html
+++ b/docs/dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html
@@ -256,7 +256,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html b/docs/dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html
index 51dbc2a5d1..feea1117ad 100644
--- a/docs/dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html
+++ b/docs/dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html
@@ -405,7 +405,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df4/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter-members.html b/docs/dc/df4/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter-members.html
index 4df1e59290..2ff5cf132c 100644
--- a/docs/dc/df4/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter-members.html
+++ b/docs/dc/df4/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter-members.html
@@ -128,7 +128,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df7/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun-members.html b/docs/dc/df7/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun-members.html
index 74c408c092..2944f0ce72 100644
--- a/docs/dc/df7/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun-members.html
+++ b/docs/dc/df7/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun-members.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dc/df8/closure__thread_8h_source.html b/docs/dc/df8/closure__thread_8h_source.html
index dbb5666e77..f6ce12483d 100644
--- a/docs/dc/df8/closure__thread_8h_source.html
+++ b/docs/dc/df8/closure__thread_8h_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d06/structshaka_1_1media_1_1mp4_1_1ChunkOffset.html b/docs/dd/d06/structshaka_1_1media_1_1mp4_1_1ChunkOffset.html
index eb436db1fa..b7fa96bf0a 100644
--- a/docs/dd/d06/structshaka_1_1media_1_1mp4_1_1ChunkOffset.html
+++ b/docs/dd/d06/structshaka_1_1media_1_1mp4_1_1ChunkOffset.html
@@ -180,7 +180,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>flags</b></td></t
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d11/mpd__builder_8cc_source.html b/docs/dd/d11/mpd__builder_8cc_source.html
index 77b63865d7..e7e2011f54 100644
--- a/docs/dd/d11/mpd__builder_8cc_source.html
+++ b/docs/dd/d11/mpd__builder_8cc_source.html
@@ -490,1025 +490,1021 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00401"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">  401</a></span>&#160;<a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">MpdBuilder::MpdBuilder</a>(MpdType type, <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options)</div>
 <div class="line"><a name="l00402"></a><span class="lineno">  402</span>&#160;    : type_(type),</div>
 <div class="line"><a name="l00403"></a><span class="lineno">  403</span>&#160;      mpd_options_(mpd_options),</div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;      adaptation_sets_deleter_(&amp;adaptation_sets_),</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;      clock_(new base::DefaultClock()) {}</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;MpdBuilder::~MpdBuilder() {}</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;</div>
-<div class="line"><a name="l00409"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">  409</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">MpdBuilder::AddBaseUrl</a>(<span class="keyword">const</span> std::string&amp; base_url) {</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;  base_urls_.push_back(base_url);</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;}</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;</div>
-<div class="line"><a name="l00413"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">  413</a></span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">MpdBuilder::AddAdaptationSet</a>(<span class="keyword">const</span> std::string&amp; lang) {</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  std::unique_ptr&lt;AdaptationSet&gt; adaptation_set(</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;      <span class="keyword">new</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>(adaptation_set_counter_.GetNext(), lang, mpd_options_,</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;                        type_, &amp;representation_counter_));</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  DCHECK(adaptation_set);</div>
-<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  adaptation_sets_.push_back(adaptation_set.get());</div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;  <span class="keywordflow">return</span> adaptation_set.release();</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;}</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;</div>
-<div class="line"><a name="l00423"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">  423</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">MpdBuilder::WriteMpdToFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">media::File</a>* output_file) {</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  DCHECK(output_file);</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;  <span class="keywordflow">return</span> WriteMpdToOutput(output_file);</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;}</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;</div>
-<div class="line"><a name="l00428"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">  428</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">MpdBuilder::ToString</a>(std::string* output) {</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  DCHECK(output);</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;  <span class="keywordflow">return</span> WriteMpdToOutput(output);</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;}</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;<span class="keyword">template</span> &lt;<span class="keyword">typename</span> OutputType&gt;</div>
-<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;<span class="keywordtype">bool</span> MpdBuilder::WriteMpdToOutput(OutputType* output) {</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;  <span class="keyword">static</span> LibXmlInitializer lib_xml_initializer;</div>
-<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  xml::scoped_xml_ptr&lt;xmlDoc&gt; doc(GenerateMpd());</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  <span class="keywordflow">if</span> (!doc.get())</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;</div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kNiceFormat = 1;</div>
-<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  <span class="keywordtype">int</span> doc_str_size = 0;</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  xmlChar* doc_str = NULL;</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;  xmlDocDumpFormatMemoryEnc(doc.get(), &amp;doc_str, &amp;doc_str_size, <span class="stringliteral">&quot;UTF-8&quot;</span>,</div>
-<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;                            kNiceFormat);</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;</div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;  <span class="keywordtype">bool</span> result = WriteXmlCharArrayToOutput(doc_str, doc_str_size, output);</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;  xmlFree(doc_str);</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;  <span class="comment">// Cleanup, free the doc.</span></div>
-<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;  doc.reset();</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;  <span class="keywordflow">return</span> result;</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;}</div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;xmlDocPtr MpdBuilder::GenerateMpd() {</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;  <span class="comment">// Setup nodes.</span></div>
-<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kXmlVersion[] = <span class="stringliteral">&quot;1.0&quot;</span>;</div>
-<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;  xml::scoped_xml_ptr&lt;xmlDoc&gt; doc(xmlNewDoc(BAD_CAST kXmlVersion));</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  XmlNode mpd(<span class="stringliteral">&quot;MPD&quot;</span>);</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  <span class="comment">// Iterate thru AdaptationSets and add them to one big Period element.</span></div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  XmlNode period(<span class="stringliteral">&quot;Period&quot;</span>);</div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  <span class="comment">// Always set id=0 for now. Since this class can only generate one Period</span></div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;  <span class="comment">// at the moment, just use a constant.</span></div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  <span class="comment">// Required for &#39;dynamic&#39; MPDs.</span></div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;  period.SetId(0);</div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;  std::list&lt;AdaptationSet*&gt;::iterator adaptation_sets_it =</div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;      adaptation_sets_.begin();</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  <span class="keywordflow">for</span> (; adaptation_sets_it != adaptation_sets_.end(); ++adaptation_sets_it) {</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; child((*adaptation_sets_it)-&gt;GetXml());</div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;    <span class="keywordflow">if</span> (!child.get() || !period.AddChild(std::move(child)))</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  }</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  <span class="comment">// Add baseurls to MPD.</span></div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;  std::list&lt;std::string&gt;::const_iterator base_urls_it = base_urls_.begin();</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  <span class="keywordflow">for</span> (; base_urls_it != base_urls_.end(); ++base_urls_it) {</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;    XmlNode base_url(<span class="stringliteral">&quot;BaseURL&quot;</span>);</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;    base_url.SetContent(*base_urls_it);</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;</div>
-<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;    <span class="keywordflow">if</span> (!mpd.AddChild(base_url.PassScopedPtr()))</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;  }</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;  <span class="keywordflow">if</span> (type_ == kDynamic) {</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;    <span class="comment">// This is the only Period and it is a regular period.</span></div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;    period.SetStringAttribute(<span class="stringliteral">&quot;start&quot;</span>, <span class="stringliteral">&quot;PT0S&quot;</span>);</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  }</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;  <span class="keywordflow">if</span> (!mpd.AddChild(period.PassScopedPtr()))</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;</div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;  AddMpdNameSpaceInfo(&amp;mpd);</div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;  AddCommonMpdInfo(&amp;mpd);</div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;  <span class="keywordflow">switch</span> (type_) {</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;    <span class="keywordflow">case</span> kStatic:</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;      AddStaticMpdInfo(&amp;mpd);</div>
-<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;    <span class="keywordflow">case</span> kDynamic:</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;      AddDynamicMpdInfo(&amp;mpd);</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;      NOTREACHED() &lt;&lt; <span class="stringliteral">&quot;Unknown MPD type: &quot;</span> &lt;&lt; type_;</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  }</div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;</div>
-<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;  DCHECK(doc);</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  <span class="keyword">const</span> std::string version = GetPackagerVersion();</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  <span class="keywordflow">if</span> (!version.empty()) {</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;    std::string version_string =</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;        base::StringPrintf(<span class="stringliteral">&quot;Generated with %s version %s&quot;</span>,</div>
-<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;                           GetPackagerProjectUrl().c_str(), version.c_str());</div>
-<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; comment(</div>
-<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;        xmlNewDocComment(doc.get(), BAD_CAST version_string.c_str()));</div>
-<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;    xmlDocSetRootElement(doc.get(), comment.get());</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;    xmlAddSibling(comment.release(), mpd.Release());</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;    xmlDocSetRootElement(doc.get(), mpd.Release());</div>
-<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;  }</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;  <span class="keywordflow">return</span> doc.release();</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;}</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddCommonMpdInfo(XmlNode* mpd_node) {</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  <span class="keywordflow">if</span> (Positive(mpd_options_.min_buffer_time)) {</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;    mpd_node-&gt;SetStringAttribute(</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;        <span class="stringliteral">&quot;minBufferTime&quot;</span>, SecondsToXmlDuration(mpd_options_.min_buffer_time));</div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;minBufferTime value not specified.&quot;</span>;</div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;    <span class="comment">// TODO(tinskip): Propagate error.</span></div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  }</div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;}</div>
-<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;</div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddStaticMpdInfo(XmlNode* mpd_node) {</div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  DCHECK(mpd_node);</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  DCHECK_EQ(MpdBuilder::kStatic, type_);</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kStaticMpdType[] = <span class="stringliteral">&quot;static&quot;</span>;</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kStaticMpdProfile[] =</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;      <span class="stringliteral">&quot;urn:mpeg:dash:profile:isoff-on-demand:2011&quot;</span>;</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;type&quot;</span>, kStaticMpdType);</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;profiles&quot;</span>, kStaticMpdProfile);</div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;  mpd_node-&gt;SetStringAttribute(</div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;      <span class="stringliteral">&quot;mediaPresentationDuration&quot;</span>,</div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;      SecondsToXmlDuration(GetStaticMpdDuration(mpd_node)));</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;}</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddDynamicMpdInfo(XmlNode* mpd_node) {</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;  DCHECK(mpd_node);</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  DCHECK_EQ(MpdBuilder::kDynamic, type_);</div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kDynamicMpdType[] = <span class="stringliteral">&quot;dynamic&quot;</span>;</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kDynamicMpdProfile[] =</div>
-<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;      <span class="stringliteral">&quot;urn:mpeg:dash:profile:isoff-live:2011&quot;</span>;</div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;type&quot;</span>, kDynamicMpdType);</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;profiles&quot;</span>, kDynamicMpdProfile);</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;  <span class="comment">// No offset from NOW.</span></div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;publishTime&quot;</span>,</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;                               XmlDateTimeNowWithOffset(0, clock_.get()));</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  <span class="comment">// &#39;availabilityStartTime&#39; is required for dynamic profile. Calculate if</span></div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  <span class="comment">// not already calculated.</span></div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;  <span class="keywordflow">if</span> (availability_start_time_.empty()) {</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;    <span class="keywordtype">double</span> earliest_presentation_time;</div>
-<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;    <span class="keywordflow">if</span> (GetEarliestTimestamp(&amp;earliest_presentation_time)) {</div>
-<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;      availability_start_time_ =</div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;          XmlDateTimeNowWithOffset(mpd_options_.availability_time_offset -</div>
-<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;                                       std::ceil(earliest_presentation_time),</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;                                   clock_.get());</div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Could not determine the earliest segment presentation &quot;</span></div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;                    <span class="stringliteral">&quot;time for availabilityStartTime calculation.&quot;</span>;</div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;      <span class="comment">// TODO(tinskip). Propagate an error.</span></div>
-<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;    }</div>
-<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;  }</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;  <span class="keywordflow">if</span> (!availability_start_time_.empty())</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;availabilityStartTime&quot;</span>,</div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;                                 availability_start_time_);</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;  <span class="keywordflow">if</span> (Positive(mpd_options_.minimum_update_period)) {</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    mpd_node-&gt;SetStringAttribute(</div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;        <span class="stringliteral">&quot;minimumUpdatePeriod&quot;</span>,</div>
-<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;        SecondsToXmlDuration(mpd_options_.minimum_update_period));</div>
-<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;The profile is dynamic but no minimumUpdatePeriod &quot;</span></div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;                    <span class="stringliteral">&quot;specified.&quot;</span>;</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;  }</div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  SetIfPositive(<span class="stringliteral">&quot;timeShiftBufferDepth&quot;</span>, mpd_options_.time_shift_buffer_depth,</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;                mpd_node);</div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;  SetIfPositive(<span class="stringliteral">&quot;suggestedPresentationDelay&quot;</span>,</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;                mpd_options_.suggested_presentation_delay, mpd_node);</div>
-<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;}</div>
-<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;</div>
-<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;<span class="keywordtype">float</span> MpdBuilder::GetStaticMpdDuration(XmlNode* mpd_node) {</div>
-<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;  DCHECK(mpd_node);</div>
-<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;  DCHECK_EQ(MpdBuilder::kStatic, type_);</div>
-<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  xmlNodePtr period_node = FindPeriodNode(mpd_node);</div>
-<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;  DCHECK(period_node) &lt;&lt; <span class="stringliteral">&quot;Period element must be a child of mpd_node.&quot;</span>;</div>
-<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  DCHECK(IsPeriodNode(period_node));</div>
-<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;</div>
-<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;  <span class="comment">// Attribute mediaPresentationDuration must be present for &#39;static&#39; MPD. So</span></div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  <span class="comment">// setting &quot;PT0S&quot; is required even if none of the representaions have duration</span></div>
-<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  <span class="comment">// attribute.</span></div>
-<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  <span class="keywordtype">float</span> max_duration = 0.0f;</div>
-<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  <span class="keywordflow">for</span> (xmlNodePtr adaptation_set = xmlFirstElementChild(period_node);</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;       adaptation_set; adaptation_set = xmlNextElementSibling(adaptation_set)) {</div>
-<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;    <span class="keywordflow">for</span> (xmlNodePtr representation = xmlFirstElementChild(adaptation_set);</div>
-<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;         representation;</div>
-<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;         representation = xmlNextElementSibling(representation)) {</div>
-<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;      <span class="keywordtype">float</span> duration = 0.0f;</div>
-<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;      <span class="keywordflow">if</span> (GetDurationAttribute(representation, &amp;duration)) {</div>
-<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;        max_duration = max_duration &gt; duration ? max_duration : duration;</div>
-<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;</div>
-<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;        <span class="comment">// &#39;duration&#39; attribute is there only to help generate MPD, not</span></div>
-<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;        <span class="comment">// necessary for MPD, remove the attribute.</span></div>
-<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;        xmlUnsetProp(representation, BAD_CAST <span class="stringliteral">&quot;duration&quot;</span>);</div>
-<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;      }</div>
-<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;    }</div>
-<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;  }</div>
-<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;</div>
-<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;  <span class="keywordflow">return</span> max_duration;</div>
-<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;}</div>
-<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;</div>
-<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;<span class="keywordtype">bool</span> MpdBuilder::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
-<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;  DCHECK(timestamp_seconds);</div>
-<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;</div>
-<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;  <span class="keywordtype">double</span> earliest_timestamp(-1);</div>
-<div class="line"><a name="l00630"></a><span class="lineno">  630</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;AdaptationSet*&gt;::const_iterator iter =</div>
-<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;           adaptation_sets_.begin();</div>
-<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;       iter != adaptation_sets_.end(); ++iter) {</div>
-<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;    <span class="keywordtype">double</span> timestamp;</div>
-<div class="line"><a name="l00634"></a><span class="lineno">  634</span>&#160;    <span class="keywordflow">if</span> ((*iter)-&gt;GetEarliestTimestamp(&amp;timestamp) &amp;&amp;</div>
-<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;        ((earliest_timestamp &lt; 0) || (timestamp &lt; earliest_timestamp))) {</div>
-<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;      earliest_timestamp = timestamp;</div>
-<div class="line"><a name="l00637"></a><span class="lineno">  637</span>&#160;    }</div>
-<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;  }</div>
-<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;  <span class="keywordflow">if</span> (earliest_timestamp &lt; 0)</div>
-<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;</div>
-<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;  *timestamp_seconds = earliest_timestamp;</div>
-<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;}</div>
-<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;</div>
-<div class="line"><a name="l00646"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">  646</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(<span class="keyword">const</span> std::string&amp; mpd_path,</div>
-<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;                                        MediaInfo* media_info) {</div>
-<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;  DCHECK(media_info);</div>
-<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;  <span class="keyword">const</span> std::string kFileProtocol(<span class="stringliteral">&quot;file://&quot;</span>);</div>
-<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;  std::string mpd_file_path = (mpd_path.find(kFileProtocol) == 0)</div>
-<div class="line"><a name="l00651"></a><span class="lineno">  651</span>&#160;                                  ? mpd_path.substr(kFileProtocol.size())</div>
-<div class="line"><a name="l00652"></a><span class="lineno">  652</span>&#160;                                  : mpd_path;</div>
-<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;</div>
-<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;  <span class="keywordflow">if</span> (!mpd_file_path.empty()) {</div>
-<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;    std::string mpd_dir(FilePath::FromUTF8Unsafe(mpd_file_path)</div>
-<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;      .DirName().AsEndingWithSeparator().AsUTF8Unsafe());</div>
-<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;    <span class="keywordflow">if</span> (!mpd_dir.empty()) {</div>
-<div class="line"><a name="l00658"></a><span class="lineno">  658</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_media_file_name()) {</div>
-<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;        media_info-&gt;set_media_file_name(</div>
-<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;            MakePathRelative(media_info-&gt;media_file_name(), mpd_dir));</div>
-<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;      }</div>
-<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_init_segment_name()) {</div>
-<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;        media_info-&gt;set_init_segment_name(</div>
-<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;            MakePathRelative(media_info-&gt;init_segment_name(), mpd_dir));</div>
-<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;      }</div>
-<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_segment_template()) {</div>
-<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;        media_info-&gt;set_segment_template(</div>
-<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;            MakePathRelative(media_info-&gt;segment_template(), mpd_dir));</div>
-<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;      }</div>
-<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;    }</div>
-<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160;  }</div>
-<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;}</div>
-<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;</div>
-<div class="line"><a name="l00674"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">  674</a></span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">AdaptationSet::AdaptationSet</a>(uint32_t adaptation_set_id,</div>
-<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;                             <span class="keyword">const</span> std::string&amp; lang,</div>
-<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;                             <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
-<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;                             MpdBuilder::MpdType mpd_type,</div>
-<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;                             base::AtomicSequenceNumber* counter)</div>
-<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;    : representations_deleter_(&amp;representations_),</div>
-<div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160;      representation_counter_(counter),</div>
-<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;      id_(adaptation_set_id),</div>
-<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;      lang_(lang),</div>
-<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;      mpd_options_(mpd_options),</div>
-<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;      mpd_type_(mpd_type),</div>
-<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;      group_(kAdaptationSetGroupNotSet),</div>
-<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;      segments_aligned_(kSegmentAlignmentUnknown),</div>
-<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;      force_set_segment_alignment_(false) {</div>
-<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;  DCHECK(counter);</div>
-<div class="line"><a name="l00689"></a><span class="lineno">  689</span>&#160;}</div>
-<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;</div>
-<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;AdaptationSet::~AdaptationSet() {}</div>
-<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;</div>
-<div class="line"><a name="l00693"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">  693</a></span>&#160;<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AdaptationSet::AddRepresentation</a>(<span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
-<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;  <span class="keyword">const</span> uint32_t representation_id = representation_counter_-&gt;GetNext();</div>
-<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;  <span class="comment">// Note that AdaptationSet outlive Representation, so this object</span></div>
-<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;  <span class="comment">// will die before AdaptationSet.</span></div>
-<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;  std::unique_ptr&lt;RepresentationStateChangeListener&gt; listener(</div>
-<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;      <span class="keyword">new</span> RepresentationStateChangeListenerImpl(representation_id, <span class="keyword">this</span>));</div>
-<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;  std::unique_ptr&lt;Representation&gt; representation(<span class="keyword">new</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>(</div>
-<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;      media_info, mpd_options_, representation_id, std::move(listener)));</div>
-<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;</div>
-<div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160;  <span class="keywordflow">if</span> (!representation-&gt;Init())</div>
-<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;</div>
-<div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160;  <span class="comment">// For videos, record the width, height, and the frame rate to calculate the</span></div>
-<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;  <span class="comment">// max {width,height,framerate} required for DASH IOP.</span></div>
-<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
-<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;    <span class="keyword">const</span> MediaInfo::VideoInfo&amp; video_info = media_info.video_info();</div>
-<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;    DCHECK(video_info.has_width());</div>
-<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;    DCHECK(video_info.has_height());</div>
-<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;    video_widths_.insert(video_info.width());</div>
-<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;    video_heights_.insert(video_info.height());</div>
-<div class="line"><a name="l00713"></a><span class="lineno">  713</span>&#160;</div>
-<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;    <span class="keywordflow">if</span> (video_info.has_time_scale() &amp;&amp; video_info.has_frame_duration())</div>
-<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;      RecordFrameRate(video_info.frame_duration(), video_info.time_scale());</div>
-<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;</div>
-<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;    AddPictureAspectRatio(video_info, &amp;picture_aspect_ratio_);</div>
-<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;  }</div>
-<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;</div>
-<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
-<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;    content_type_ = <span class="stringliteral">&quot;video&quot;</span>;</div>
-<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info.has_audio_info()) {</div>
-<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;    content_type_ = <span class="stringliteral">&quot;audio&quot;</span>;</div>
-<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info.has_text_info()) {</div>
-<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;    content_type_ = <span class="stringliteral">&quot;text&quot;</span>;</div>
-<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;</div>
-<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;    <span class="keywordflow">if</span> (media_info.text_info().has_type() &amp;&amp;</div>
-<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;        (media_info.text_info().type() != MediaInfo::TextInfo::UNKNOWN)) {</div>
-<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;      roles_.insert(MediaInfoTextTypeToRole(media_info.text_info().type()));</div>
-<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;    }</div>
-<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;  }</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;      clock_(new base::DefaultClock()) {}</div>
+<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;MpdBuilder::~MpdBuilder() {}</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;</div>
+<div class="line"><a name="l00408"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">  408</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">MpdBuilder::AddBaseUrl</a>(<span class="keyword">const</span> std::string&amp; base_url) {</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  base_urls_.push_back(base_url);</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;}</div>
+<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;</div>
+<div class="line"><a name="l00412"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">  412</a></span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>* <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">MpdBuilder::AddAdaptationSet</a>(<span class="keyword">const</span> std::string&amp; lang) {</div>
+<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;  std::unique_ptr&lt;AdaptationSet&gt; adaptation_set(</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;      <span class="keyword">new</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a>(adaptation_set_counter_.GetNext(), lang, mpd_options_,</div>
+<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;                        type_, &amp;representation_counter_));</div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  DCHECK(adaptation_set);</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  adaptation_sets_.push_back(std::move(adaptation_set));</div>
+<div class="line"><a name="l00419"></a><span class="lineno">  419</span>&#160;  <span class="keywordflow">return</span> adaptation_sets_.back().get();</div>
+<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;}</div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;</div>
+<div class="line"><a name="l00422"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">  422</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">MpdBuilder::WriteMpdToFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">media::File</a>* output_file) {</div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;  DCHECK(output_file);</div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;  <span class="keywordflow">return</span> WriteMpdToOutput(output_file);</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;}</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;</div>
+<div class="line"><a name="l00427"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">  427</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">MpdBuilder::ToString</a>(std::string* output) {</div>
+<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;  DCHECK(output);</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  <span class="keywordflow">return</span> WriteMpdToOutput(output);</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;}</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;<span class="keyword">template</span> &lt;<span class="keyword">typename</span> OutputType&gt;</div>
+<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;<span class="keywordtype">bool</span> MpdBuilder::WriteMpdToOutput(OutputType* output) {</div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;  <span class="keyword">static</span> LibXmlInitializer lib_xml_initializer;</div>
+<div class="line"><a name="l00434"></a><span class="lineno">  434</span>&#160;</div>
+<div class="line"><a name="l00435"></a><span class="lineno">  435</span>&#160;  xml::scoped_xml_ptr&lt;xmlDoc&gt; doc(GenerateMpd());</div>
+<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;  <span class="keywordflow">if</span> (!doc.get())</div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;</div>
+<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> kNiceFormat = 1;</div>
+<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  <span class="keywordtype">int</span> doc_str_size = 0;</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  xmlChar* doc_str = NULL;</div>
+<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;  xmlDocDumpFormatMemoryEnc(doc.get(), &amp;doc_str, &amp;doc_str_size, <span class="stringliteral">&quot;UTF-8&quot;</span>,</div>
+<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;                            kNiceFormat);</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;</div>
+<div class="line"><a name="l00445"></a><span class="lineno">  445</span>&#160;  <span class="keywordtype">bool</span> result = WriteXmlCharArrayToOutput(doc_str, doc_str_size, output);</div>
+<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;  xmlFree(doc_str);</div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;  <span class="comment">// Cleanup, free the doc.</span></div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;  doc.reset();</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</span>&#160;  <span class="keywordflow">return</span> result;</div>
+<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;}</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;xmlDocPtr MpdBuilder::GenerateMpd() {</div>
+<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;  <span class="comment">// Setup nodes.</span></div>
+<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kXmlVersion[] = <span class="stringliteral">&quot;1.0&quot;</span>;</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;  xml::scoped_xml_ptr&lt;xmlDoc&gt; doc(xmlNewDoc(BAD_CAST kXmlVersion));</div>
+<div class="line"><a name="l00457"></a><span class="lineno">  457</span>&#160;  XmlNode mpd(<span class="stringliteral">&quot;MPD&quot;</span>);</div>
+<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;</div>
+<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;  <span class="comment">// Iterate thru AdaptationSets and add them to one big Period element.</span></div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  XmlNode period(<span class="stringliteral">&quot;Period&quot;</span>);</div>
+<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;</div>
+<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;  <span class="comment">// Always set id=0 for now. Since this class can only generate one Period</span></div>
+<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  <span class="comment">// at the moment, just use a constant.</span></div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;  <span class="comment">// Required for &#39;dynamic&#39; MPDs.</span></div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  period.SetId(0);</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;AdaptationSet&gt;&amp; adaptation_set :</div>
+<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160;       adaptation_sets_) {</div>
+<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; child(adaptation_set-&gt;GetXml());</div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;    <span class="keywordflow">if</span> (!child.get() || !period.AddChild(std::move(child)))</div>
+<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;  }</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;  <span class="comment">// Add baseurls to MPD.</span></div>
+<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;  std::list&lt;std::string&gt;::const_iterator base_urls_it = base_urls_.begin();</div>
+<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;  <span class="keywordflow">for</span> (; base_urls_it != base_urls_.end(); ++base_urls_it) {</div>
+<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;    XmlNode base_url(<span class="stringliteral">&quot;BaseURL&quot;</span>);</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;    base_url.SetContent(*base_urls_it);</div>
+<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;</div>
+<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;    <span class="keywordflow">if</span> (!mpd.AddChild(base_url.PassScopedPtr()))</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;  }</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;</div>
+<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;  <span class="keywordflow">if</span> (type_ == kDynamic) {</div>
+<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;    <span class="comment">// This is the only Period and it is a regular period.</span></div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;    period.SetStringAttribute(<span class="stringliteral">&quot;start&quot;</span>, <span class="stringliteral">&quot;PT0S&quot;</span>);</div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;  }</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;</div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  <span class="keywordflow">if</span> (!mpd.AddChild(period.PassScopedPtr()))</div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  AddMpdNameSpaceInfo(&amp;mpd);</div>
+<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;  AddCommonMpdInfo(&amp;mpd);</div>
+<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;  <span class="keywordflow">switch</span> (type_) {</div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;    <span class="keywordflow">case</span> kStatic:</div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;      AddStaticMpdInfo(&amp;mpd);</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;    <span class="keywordflow">case</span> kDynamic:</div>
+<div class="line"><a name="l00498"></a><span class="lineno">  498</span>&#160;      AddDynamicMpdInfo(&amp;mpd);</div>
+<div class="line"><a name="l00499"></a><span class="lineno">  499</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;      NOTREACHED() &lt;&lt; <span class="stringliteral">&quot;Unknown MPD type: &quot;</span> &lt;&lt; type_;</div>
+<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;  }</div>
+<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  DCHECK(doc);</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;  <span class="keyword">const</span> std::string version = GetPackagerVersion();</div>
+<div class="line"><a name="l00507"></a><span class="lineno">  507</span>&#160;  <span class="keywordflow">if</span> (!version.empty()) {</div>
+<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;    std::string version_string =</div>
+<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;        base::StringPrintf(<span class="stringliteral">&quot;Generated with %s version %s&quot;</span>,</div>
+<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;                           GetPackagerProjectUrl().c_str(), version.c_str());</div>
+<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; comment(</div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;        xmlNewDocComment(doc.get(), BAD_CAST version_string.c_str()));</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;    xmlDocSetRootElement(doc.get(), comment.get());</div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;    xmlAddSibling(comment.release(), mpd.Release());</div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;    xmlDocSetRootElement(doc.get(), mpd.Release());</div>
+<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;  }</div>
+<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;  <span class="keywordflow">return</span> doc.release();</div>
+<div class="line"><a name="l00519"></a><span class="lineno">  519</span>&#160;}</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;</div>
+<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddCommonMpdInfo(XmlNode* mpd_node) {</div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;  <span class="keywordflow">if</span> (Positive(mpd_options_.min_buffer_time)) {</div>
+<div class="line"><a name="l00523"></a><span class="lineno">  523</span>&#160;    mpd_node-&gt;SetStringAttribute(</div>
+<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;        <span class="stringliteral">&quot;minBufferTime&quot;</span>, SecondsToXmlDuration(mpd_options_.min_buffer_time));</div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;minBufferTime value not specified.&quot;</span>;</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;    <span class="comment">// TODO(tinskip): Propagate error.</span></div>
+<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;  }</div>
+<div class="line"><a name="l00529"></a><span class="lineno">  529</span>&#160;}</div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;</div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddStaticMpdInfo(XmlNode* mpd_node) {</div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;  DCHECK(mpd_node);</div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;  DCHECK_EQ(MpdBuilder::kStatic, type_);</div>
+<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;</div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kStaticMpdType[] = <span class="stringliteral">&quot;static&quot;</span>;</div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kStaticMpdProfile[] =</div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;      <span class="stringliteral">&quot;urn:mpeg:dash:profile:isoff-on-demand:2011&quot;</span>;</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;type&quot;</span>, kStaticMpdType);</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;profiles&quot;</span>, kStaticMpdProfile);</div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  mpd_node-&gt;SetStringAttribute(</div>
+<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;      <span class="stringliteral">&quot;mediaPresentationDuration&quot;</span>,</div>
+<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;      SecondsToXmlDuration(GetStaticMpdDuration(mpd_node)));</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;}</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;<span class="keywordtype">void</span> MpdBuilder::AddDynamicMpdInfo(XmlNode* mpd_node) {</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;  DCHECK(mpd_node);</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;  DCHECK_EQ(MpdBuilder::kDynamic, type_);</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kDynamicMpdType[] = <span class="stringliteral">&quot;dynamic&quot;</span>;</div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> kDynamicMpdProfile[] =</div>
+<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;      <span class="stringliteral">&quot;urn:mpeg:dash:profile:isoff-live:2011&quot;</span>;</div>
+<div class="line"><a name="l00552"></a><span class="lineno">  552</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;type&quot;</span>, kDynamicMpdType);</div>
+<div class="line"><a name="l00553"></a><span class="lineno">  553</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;profiles&quot;</span>, kDynamicMpdProfile);</div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;  <span class="comment">// No offset from NOW.</span></div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;  mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;publishTime&quot;</span>,</div>
+<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;                               XmlDateTimeNowWithOffset(0, clock_.get()));</div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  <span class="comment">// &#39;availabilityStartTime&#39; is required for dynamic profile. Calculate if</span></div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  <span class="comment">// not already calculated.</span></div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  <span class="keywordflow">if</span> (availability_start_time_.empty()) {</div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;    <span class="keywordtype">double</span> earliest_presentation_time;</div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;    <span class="keywordflow">if</span> (GetEarliestTimestamp(&amp;earliest_presentation_time)) {</div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;      availability_start_time_ =</div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;          XmlDateTimeNowWithOffset(mpd_options_.availability_time_offset -</div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;                                       std::ceil(earliest_presentation_time),</div>
+<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160;                                   clock_.get());</div>
+<div class="line"><a name="l00568"></a><span class="lineno">  568</span>&#160;    } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Could not determine the earliest segment presentation &quot;</span></div>
+<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;                    <span class="stringliteral">&quot;time for availabilityStartTime calculation.&quot;</span>;</div>
+<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;      <span class="comment">// TODO(tinskip). Propagate an error.</span></div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;    }</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</span>&#160;  }</div>
+<div class="line"><a name="l00574"></a><span class="lineno">  574</span>&#160;  <span class="keywordflow">if</span> (!availability_start_time_.empty())</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;    mpd_node-&gt;SetStringAttribute(<span class="stringliteral">&quot;availabilityStartTime&quot;</span>,</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;                                 availability_start_time_);</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;</div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;  <span class="keywordflow">if</span> (Positive(mpd_options_.minimum_update_period)) {</div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;    mpd_node-&gt;SetStringAttribute(</div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;        <span class="stringliteral">&quot;minimumUpdatePeriod&quot;</span>,</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;        SecondsToXmlDuration(mpd_options_.minimum_update_period));</div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;The profile is dynamic but no minimumUpdatePeriod &quot;</span></div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;                    <span class="stringliteral">&quot;specified.&quot;</span>;</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;  }</div>
+<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;</div>
+<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;  SetIfPositive(<span class="stringliteral">&quot;timeShiftBufferDepth&quot;</span>, mpd_options_.time_shift_buffer_depth,</div>
+<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;                mpd_node);</div>
+<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;  SetIfPositive(<span class="stringliteral">&quot;suggestedPresentationDelay&quot;</span>,</div>
+<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;                mpd_options_.suggested_presentation_delay, mpd_node);</div>
+<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;}</div>
+<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;</div>
+<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;<span class="keywordtype">float</span> MpdBuilder::GetStaticMpdDuration(XmlNode* mpd_node) {</div>
+<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;  DCHECK(mpd_node);</div>
+<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  DCHECK_EQ(MpdBuilder::kStatic, type_);</div>
+<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;</div>
+<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;  xmlNodePtr period_node = FindPeriodNode(mpd_node);</div>
+<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;  DCHECK(period_node) &lt;&lt; <span class="stringliteral">&quot;Period element must be a child of mpd_node.&quot;</span>;</div>
+<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;  DCHECK(IsPeriodNode(period_node));</div>
+<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;</div>
+<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  <span class="comment">// Attribute mediaPresentationDuration must be present for &#39;static&#39; MPD. So</span></div>
+<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;  <span class="comment">// setting &quot;PT0S&quot; is required even if none of the representaions have duration</span></div>
+<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;  <span class="comment">// attribute.</span></div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  <span class="keywordtype">float</span> max_duration = 0.0f;</div>
+<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  <span class="keywordflow">for</span> (xmlNodePtr adaptation_set = xmlFirstElementChild(period_node);</div>
+<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;       adaptation_set; adaptation_set = xmlNextElementSibling(adaptation_set)) {</div>
+<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;    <span class="keywordflow">for</span> (xmlNodePtr representation = xmlFirstElementChild(adaptation_set);</div>
+<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;         representation;</div>
+<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;         representation = xmlNextElementSibling(representation)) {</div>
+<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;      <span class="keywordtype">float</span> duration = 0.0f;</div>
+<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;      <span class="keywordflow">if</span> (GetDurationAttribute(representation, &amp;duration)) {</div>
+<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;        max_duration = max_duration &gt; duration ? max_duration : duration;</div>
+<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;</div>
+<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;        <span class="comment">// &#39;duration&#39; attribute is there only to help generate MPD, not</span></div>
+<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;        <span class="comment">// necessary for MPD, remove the attribute.</span></div>
+<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;        xmlUnsetProp(representation, BAD_CAST <span class="stringliteral">&quot;duration&quot;</span>);</div>
+<div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;      }</div>
+<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;    }</div>
+<div class="line"><a name="l00619"></a><span class="lineno">  619</span>&#160;  }</div>
+<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160;</div>
+<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;  <span class="keywordflow">return</span> max_duration;</div>
+<div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;}</div>
+<div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;</div>
+<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;<span class="keywordtype">bool</span> MpdBuilder::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
+<div class="line"><a name="l00625"></a><span class="lineno">  625</span>&#160;  DCHECK(timestamp_seconds);</div>
+<div class="line"><a name="l00626"></a><span class="lineno">  626</span>&#160;</div>
+<div class="line"><a name="l00627"></a><span class="lineno">  627</span>&#160;  <span class="keywordtype">double</span> earliest_timestamp(-1);</div>
+<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;AdaptationSet&gt;&amp; adaptation_set :</div>
+<div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;       adaptation_sets_) {</div>
+<div class="line"><a name="l00630"></a><span class="lineno">  630</span>&#160;    <span class="keywordtype">double</span> timestamp;</div>
+<div class="line"><a name="l00631"></a><span class="lineno">  631</span>&#160;    <span class="keywordflow">if</span> (adaptation_set-&gt;GetEarliestTimestamp(&amp;timestamp) &amp;&amp;</div>
+<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160;        ((earliest_timestamp &lt; 0) || (timestamp &lt; earliest_timestamp))) {</div>
+<div class="line"><a name="l00633"></a><span class="lineno">  633</span>&#160;      earliest_timestamp = timestamp;</div>
+<div class="line"><a name="l00634"></a><span class="lineno">  634</span>&#160;    }</div>
+<div class="line"><a name="l00635"></a><span class="lineno">  635</span>&#160;  }</div>
+<div class="line"><a name="l00636"></a><span class="lineno">  636</span>&#160;  <span class="keywordflow">if</span> (earliest_timestamp &lt; 0)</div>
+<div class="line"><a name="l00637"></a><span class="lineno">  637</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00638"></a><span class="lineno">  638</span>&#160;</div>
+<div class="line"><a name="l00639"></a><span class="lineno">  639</span>&#160;  *timestamp_seconds = earliest_timestamp;</div>
+<div class="line"><a name="l00640"></a><span class="lineno">  640</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160;}</div>
+<div class="line"><a name="l00642"></a><span class="lineno">  642</span>&#160;</div>
+<div class="line"><a name="l00643"></a><span class="lineno"><a class="line" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">  643</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MpdBuilder::MakePathsRelativeToMpd</a>(<span class="keyword">const</span> std::string&amp; mpd_path,</div>
+<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160;                                        MediaInfo* media_info) {</div>
+<div class="line"><a name="l00645"></a><span class="lineno">  645</span>&#160;  DCHECK(media_info);</div>
+<div class="line"><a name="l00646"></a><span class="lineno">  646</span>&#160;  <span class="keyword">const</span> std::string kFileProtocol(<span class="stringliteral">&quot;file://&quot;</span>);</div>
+<div class="line"><a name="l00647"></a><span class="lineno">  647</span>&#160;  std::string mpd_file_path = (mpd_path.find(kFileProtocol) == 0)</div>
+<div class="line"><a name="l00648"></a><span class="lineno">  648</span>&#160;                                  ? mpd_path.substr(kFileProtocol.size())</div>
+<div class="line"><a name="l00649"></a><span class="lineno">  649</span>&#160;                                  : mpd_path;</div>
+<div class="line"><a name="l00650"></a><span class="lineno">  650</span>&#160;</div>
+<div class="line"><a name="l00651"></a><span class="lineno">  651</span>&#160;  <span class="keywordflow">if</span> (!mpd_file_path.empty()) {</div>
+<div class="line"><a name="l00652"></a><span class="lineno">  652</span>&#160;    std::string mpd_dir(FilePath::FromUTF8Unsafe(mpd_file_path)</div>
+<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160;      .DirName().AsEndingWithSeparator().AsUTF8Unsafe());</div>
+<div class="line"><a name="l00654"></a><span class="lineno">  654</span>&#160;    <span class="keywordflow">if</span> (!mpd_dir.empty()) {</div>
+<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_media_file_name()) {</div>
+<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160;        media_info-&gt;set_media_file_name(</div>
+<div class="line"><a name="l00657"></a><span class="lineno">  657</span>&#160;            MakePathRelative(media_info-&gt;media_file_name(), mpd_dir));</div>
+<div class="line"><a name="l00658"></a><span class="lineno">  658</span>&#160;      }</div>
+<div class="line"><a name="l00659"></a><span class="lineno">  659</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_init_segment_name()) {</div>
+<div class="line"><a name="l00660"></a><span class="lineno">  660</span>&#160;        media_info-&gt;set_init_segment_name(</div>
+<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160;            MakePathRelative(media_info-&gt;init_segment_name(), mpd_dir));</div>
+<div class="line"><a name="l00662"></a><span class="lineno">  662</span>&#160;      }</div>
+<div class="line"><a name="l00663"></a><span class="lineno">  663</span>&#160;      <span class="keywordflow">if</span> (media_info-&gt;has_segment_template()) {</div>
+<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160;        media_info-&gt;set_segment_template(</div>
+<div class="line"><a name="l00665"></a><span class="lineno">  665</span>&#160;            MakePathRelative(media_info-&gt;segment_template(), mpd_dir));</div>
+<div class="line"><a name="l00666"></a><span class="lineno">  666</span>&#160;      }</div>
+<div class="line"><a name="l00667"></a><span class="lineno">  667</span>&#160;    }</div>
+<div class="line"><a name="l00668"></a><span class="lineno">  668</span>&#160;  }</div>
+<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160;}</div>
+<div class="line"><a name="l00670"></a><span class="lineno">  670</span>&#160;</div>
+<div class="line"><a name="l00671"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">  671</a></span>&#160;<a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">AdaptationSet::AdaptationSet</a>(uint32_t adaptation_set_id,</div>
+<div class="line"><a name="l00672"></a><span class="lineno">  672</span>&#160;                             <span class="keyword">const</span> std::string&amp; lang,</div>
+<div class="line"><a name="l00673"></a><span class="lineno">  673</span>&#160;                             <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
+<div class="line"><a name="l00674"></a><span class="lineno">  674</span>&#160;                             MpdBuilder::MpdType mpd_type,</div>
+<div class="line"><a name="l00675"></a><span class="lineno">  675</span>&#160;                             base::AtomicSequenceNumber* counter)</div>
+<div class="line"><a name="l00676"></a><span class="lineno">  676</span>&#160;    : representation_counter_(counter),</div>
+<div class="line"><a name="l00677"></a><span class="lineno">  677</span>&#160;      id_(adaptation_set_id),</div>
+<div class="line"><a name="l00678"></a><span class="lineno">  678</span>&#160;      lang_(lang),</div>
+<div class="line"><a name="l00679"></a><span class="lineno">  679</span>&#160;      mpd_options_(mpd_options),</div>
+<div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160;      mpd_type_(mpd_type),</div>
+<div class="line"><a name="l00681"></a><span class="lineno">  681</span>&#160;      group_(kAdaptationSetGroupNotSet),</div>
+<div class="line"><a name="l00682"></a><span class="lineno">  682</span>&#160;      segments_aligned_(kSegmentAlignmentUnknown),</div>
+<div class="line"><a name="l00683"></a><span class="lineno">  683</span>&#160;      force_set_segment_alignment_(false) {</div>
+<div class="line"><a name="l00684"></a><span class="lineno">  684</span>&#160;  DCHECK(counter);</div>
+<div class="line"><a name="l00685"></a><span class="lineno">  685</span>&#160;}</div>
+<div class="line"><a name="l00686"></a><span class="lineno">  686</span>&#160;</div>
+<div class="line"><a name="l00687"></a><span class="lineno">  687</span>&#160;AdaptationSet::~AdaptationSet() {}</div>
+<div class="line"><a name="l00688"></a><span class="lineno">  688</span>&#160;</div>
+<div class="line"><a name="l00689"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">  689</a></span>&#160;<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">AdaptationSet::AddRepresentation</a>(<span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
+<div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;  <span class="keyword">const</span> uint32_t representation_id = representation_counter_-&gt;GetNext();</div>
+<div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;  <span class="comment">// Note that AdaptationSet outlive Representation, so this object</span></div>
+<div class="line"><a name="l00692"></a><span class="lineno">  692</span>&#160;  <span class="comment">// will die before AdaptationSet.</span></div>
+<div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160;  std::unique_ptr&lt;RepresentationStateChangeListener&gt; listener(</div>
+<div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;      <span class="keyword">new</span> RepresentationStateChangeListenerImpl(representation_id, <span class="keyword">this</span>));</div>
+<div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;  std::unique_ptr&lt;Representation&gt; representation(<span class="keyword">new</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>(</div>
+<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;      media_info, mpd_options_, representation_id, std::move(listener)));</div>
+<div class="line"><a name="l00697"></a><span class="lineno">  697</span>&#160;</div>
+<div class="line"><a name="l00698"></a><span class="lineno">  698</span>&#160;  <span class="keywordflow">if</span> (!representation-&gt;Init())</div>
+<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00700"></a><span class="lineno">  700</span>&#160;</div>
+<div class="line"><a name="l00701"></a><span class="lineno">  701</span>&#160;  <span class="comment">// For videos, record the width, height, and the frame rate to calculate the</span></div>
+<div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160;  <span class="comment">// max {width,height,framerate} required for DASH IOP.</span></div>
+<div class="line"><a name="l00703"></a><span class="lineno">  703</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
+<div class="line"><a name="l00704"></a><span class="lineno">  704</span>&#160;    <span class="keyword">const</span> MediaInfo::VideoInfo&amp; video_info = media_info.video_info();</div>
+<div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160;    DCHECK(video_info.has_width());</div>
+<div class="line"><a name="l00706"></a><span class="lineno">  706</span>&#160;    DCHECK(video_info.has_height());</div>
+<div class="line"><a name="l00707"></a><span class="lineno">  707</span>&#160;    video_widths_.insert(video_info.width());</div>
+<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160;    video_heights_.insert(video_info.height());</div>
+<div class="line"><a name="l00709"></a><span class="lineno">  709</span>&#160;</div>
+<div class="line"><a name="l00710"></a><span class="lineno">  710</span>&#160;    <span class="keywordflow">if</span> (video_info.has_time_scale() &amp;&amp; video_info.has_frame_duration())</div>
+<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160;      RecordFrameRate(video_info.frame_duration(), video_info.time_scale());</div>
+<div class="line"><a name="l00712"></a><span class="lineno">  712</span>&#160;</div>
+<div class="line"><a name="l00713"></a><span class="lineno">  713</span>&#160;    AddPictureAspectRatio(video_info, &amp;picture_aspect_ratio_);</div>
+<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160;  }</div>
+<div class="line"><a name="l00715"></a><span class="lineno">  715</span>&#160;</div>
+<div class="line"><a name="l00716"></a><span class="lineno">  716</span>&#160;  <span class="keywordflow">if</span> (media_info.has_video_info()) {</div>
+<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160;    content_type_ = <span class="stringliteral">&quot;video&quot;</span>;</div>
+<div class="line"><a name="l00718"></a><span class="lineno">  718</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info.has_audio_info()) {</div>
+<div class="line"><a name="l00719"></a><span class="lineno">  719</span>&#160;    content_type_ = <span class="stringliteral">&quot;audio&quot;</span>;</div>
+<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info.has_text_info()) {</div>
+<div class="line"><a name="l00721"></a><span class="lineno">  721</span>&#160;    content_type_ = <span class="stringliteral">&quot;text&quot;</span>;</div>
+<div class="line"><a name="l00722"></a><span class="lineno">  722</span>&#160;</div>
+<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160;    <span class="keywordflow">if</span> (media_info.text_info().has_type() &amp;&amp;</div>
+<div class="line"><a name="l00724"></a><span class="lineno">  724</span>&#160;        (media_info.text_info().type() != MediaInfo::TextInfo::UNKNOWN)) {</div>
+<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160;      roles_.insert(MediaInfoTextTypeToRole(media_info.text_info().type()));</div>
+<div class="line"><a name="l00726"></a><span class="lineno">  726</span>&#160;    }</div>
+<div class="line"><a name="l00727"></a><span class="lineno">  727</span>&#160;  }</div>
+<div class="line"><a name="l00728"></a><span class="lineno">  728</span>&#160;</div>
+<div class="line"><a name="l00729"></a><span class="lineno">  729</span>&#160;  representations_.push_back(std::move(representation));</div>
+<div class="line"><a name="l00730"></a><span class="lineno">  730</span>&#160;  <span class="keywordflow">return</span> representations_.back().get();</div>
+<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160;}</div>
 <div class="line"><a name="l00732"></a><span class="lineno">  732</span>&#160;</div>
-<div class="line"><a name="l00733"></a><span class="lineno">  733</span>&#160;  representations_.push_back(representation.get());</div>
-<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;  <span class="keywordflow">return</span> representation.release();</div>
-<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;}</div>
-<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;</div>
-<div class="line"><a name="l00737"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">  737</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">AdaptationSet::AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
-<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160;  content_protection_elements_.push_back(content_protection_element);</div>
-<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;  RemoveDuplicateAttributes(&amp;content_protection_elements_.back());</div>
-<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;}</div>
-<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;</div>
-<div class="line"><a name="l00743"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">  743</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">AdaptationSet::UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;                                                <span class="keyword">const</span> std::string&amp; pssh) {</div>
-<div class="line"><a name="l00745"></a><span class="lineno">  745</span>&#160;  UpdateContentProtectionPsshHelper(drm_uuid, pssh,</div>
-<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;                                    &amp;content_protection_elements_);</div>
+<div class="line"><a name="l00733"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">  733</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">AdaptationSet::AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l00734"></a><span class="lineno">  734</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
+<div class="line"><a name="l00735"></a><span class="lineno">  735</span>&#160;  content_protection_elements_.push_back(content_protection_element);</div>
+<div class="line"><a name="l00736"></a><span class="lineno">  736</span>&#160;  RemoveDuplicateAttributes(&amp;content_protection_elements_.back());</div>
+<div class="line"><a name="l00737"></a><span class="lineno">  737</span>&#160;}</div>
+<div class="line"><a name="l00738"></a><span class="lineno">  738</span>&#160;</div>
+<div class="line"><a name="l00739"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">  739</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">AdaptationSet::UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l00740"></a><span class="lineno">  740</span>&#160;                                                <span class="keyword">const</span> std::string&amp; pssh) {</div>
+<div class="line"><a name="l00741"></a><span class="lineno">  741</span>&#160;  UpdateContentProtectionPsshHelper(drm_uuid, pssh,</div>
+<div class="line"><a name="l00742"></a><span class="lineno">  742</span>&#160;                                    &amp;content_protection_elements_);</div>
+<div class="line"><a name="l00743"></a><span class="lineno">  743</span>&#160;}</div>
+<div class="line"><a name="l00744"></a><span class="lineno">  744</span>&#160;</div>
+<div class="line"><a name="l00745"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">  745</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">AdaptationSet::AddRole</a>(Role role) {</div>
+<div class="line"><a name="l00746"></a><span class="lineno">  746</span>&#160;  roles_.insert(role);</div>
 <div class="line"><a name="l00747"></a><span class="lineno">  747</span>&#160;}</div>
 <div class="line"><a name="l00748"></a><span class="lineno">  748</span>&#160;</div>
-<div class="line"><a name="l00749"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">  749</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">AdaptationSet::AddRole</a>(Role role) {</div>
-<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;  roles_.insert(role);</div>
-<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;}</div>
-<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;</div>
-<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;<span class="comment">// Creates a copy of &lt;AdaptationSet&gt; xml element, iterate thru all the</span></div>
-<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;<span class="comment">// &lt;Representation&gt; (child) elements and add them to the copy.</span></div>
-<div class="line"><a name="l00755"></a><span class="lineno">  755</span>&#160;<span class="comment">// Set all the attributes first and then add the children elements so that flags</span></div>
-<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;<span class="comment">// can be passed to Representation to avoid setting redundant attributes. For</span></div>
-<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;<span class="comment">// example, if AdaptationSet@width is set, then Representation@width is</span></div>
-<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;<span class="comment">// redundant and should not be set.</span></div>
-<div class="line"><a name="l00759"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">  759</a></span>&#160;xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">AdaptationSet::GetXml</a>() {</div>
-<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;  AdaptationSetXmlNode adaptation_set;</div>
+<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160;<span class="comment">// Creates a copy of &lt;AdaptationSet&gt; xml element, iterate thru all the</span></div>
+<div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;<span class="comment">// &lt;Representation&gt; (child) elements and add them to the copy.</span></div>
+<div class="line"><a name="l00751"></a><span class="lineno">  751</span>&#160;<span class="comment">// Set all the attributes first and then add the children elements so that flags</span></div>
+<div class="line"><a name="l00752"></a><span class="lineno">  752</span>&#160;<span class="comment">// can be passed to Representation to avoid setting redundant attributes. For</span></div>
+<div class="line"><a name="l00753"></a><span class="lineno">  753</span>&#160;<span class="comment">// example, if AdaptationSet@width is set, then Representation@width is</span></div>
+<div class="line"><a name="l00754"></a><span class="lineno">  754</span>&#160;<span class="comment">// redundant and should not be set.</span></div>
+<div class="line"><a name="l00755"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">  755</a></span>&#160;xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">AdaptationSet::GetXml</a>() {</div>
+<div class="line"><a name="l00756"></a><span class="lineno">  756</span>&#160;  AdaptationSetXmlNode adaptation_set;</div>
+<div class="line"><a name="l00757"></a><span class="lineno">  757</span>&#160;</div>
+<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_width = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00759"></a><span class="lineno">  759</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_height = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00760"></a><span class="lineno">  760</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_frame_rate = <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00761"></a><span class="lineno">  761</span>&#160;</div>
-<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_width = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_height = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;  <span class="keywordtype">bool</span> suppress_representation_frame_rate = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;</div>
-<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;  adaptation_set.SetId(id_);</div>
-<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;  adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;contentType&quot;</span>, content_type_);</div>
-<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;  <span class="keywordflow">if</span> (!lang_.empty() &amp;&amp; lang_ != <span class="stringliteral">&quot;und&quot;</span>) {</div>
-<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;lang&quot;</span>, <a class="code" href="../../d8/daf/namespaceshaka.html#a5f657931280fdf63cae2ed8a8f891288">LanguageToShortestForm</a>(lang_));</div>
-<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;  }</div>
-<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;</div>
-<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;  <span class="comment">// Note that std::{set,map} are ordered, so the last element is the max value.</span></div>
-<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;  <span class="keywordflow">if</span> (video_widths_.size() == 1) {</div>
-<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;    suppress_representation_width = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;width&quot;</span>, *video_widths_.begin());</div>
-<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_widths_.size() &gt; 1) {</div>
-<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;maxWidth&quot;</span>, *video_widths_.rbegin());</div>
-<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;  }</div>
-<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;  <span class="keywordflow">if</span> (video_heights_.size() == 1) {</div>
-<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;    suppress_representation_height = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;height&quot;</span>, *video_heights_.begin());</div>
-<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_heights_.size() &gt; 1) {</div>
-<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;maxHeight&quot;</span>, *video_heights_.rbegin());</div>
-<div class="line"><a name="l00784"></a><span class="lineno">  784</span>&#160;  }</div>
-<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;</div>
-<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;  <span class="keywordflow">if</span> (video_frame_rates_.size() == 1) {</div>
-<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;    suppress_representation_frame_rate = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;frameRate&quot;</span>,</div>
-<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;                                      video_frame_rates_.begin()-&gt;second);</div>
-<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_frame_rates_.size() &gt; 1) {</div>
-<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;maxFrameRate&quot;</span>,</div>
-<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;                                      video_frame_rates_.rbegin()-&gt;second);</div>
-<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;  }</div>
-<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;</div>
-<div class="line"><a name="l00795"></a><span class="lineno">  795</span>&#160;  <span class="comment">// Note: must be checked before checking segments_aligned_ (below). So that</span></div>
-<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;  <span class="comment">// segments_aligned_ is set before checking below.</span></div>
-<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;  <span class="keywordflow">if</span> (mpd_type_ == MpdBuilder::kStatic) {</div>
-<div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160;    CheckVodSegmentAlignment();</div>
-<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;  }</div>
-<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;</div>
-<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentTrue) {</div>
-<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;    adaptation_set.SetStringAttribute(mpd_type_ == MpdBuilder::kStatic</div>
-<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;                                          ? <span class="stringliteral">&quot;subsegmentAlignment&quot;</span></div>
-<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;                                          : <span class="stringliteral">&quot;segmentAlignment&quot;</span>,</div>
-<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;                                      <span class="stringliteral">&quot;true&quot;</span>);</div>
-<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;  }</div>
-<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;</div>
-<div class="line"><a name="l00808"></a><span class="lineno">  808</span>&#160;  <span class="keywordflow">if</span> (picture_aspect_ratio_.size() == 1)</div>
-<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;par&quot;</span>, *picture_aspect_ratio_.begin());</div>
-<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;</div>
-<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;  <span class="keywordflow">if</span> (group_ &gt;= 0)</div>
-<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;group&quot;</span>, group_);</div>
-<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;</div>
-<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;  <span class="keywordflow">if</span> (!adaptation_set.AddContentProtectionElements(</div>
-<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;          content_protection_elements_)) {</div>
-<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;  }</div>
-<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;  <span class="keywordflow">for</span> (AdaptationSet::Role role : roles_)</div>
-<div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;    adaptation_set.AddRoleElement(<span class="stringliteral">&quot;urn:mpeg:dash:role:2011&quot;</span>, RoleToText(role));</div>
-<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;</div>
-<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;  <span class="keywordflow">for</span> (<a class="code" href="../../de/d52/classshaka_1_1Representation.html">Representation</a>* representation : representations_) {</div>
-<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_width)</div>
-<div class="line"><a name="l00823"></a><span class="lineno">  823</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressWidth);</div>
-<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_height)</div>
-<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressHeight);</div>
-<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_frame_rate)</div>
-<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressFrameRate);</div>
-<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; child(representation-&gt;GetXml());</div>
-<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;    <span class="keywordflow">if</span> (!child || !adaptation_set.AddChild(std::move(child)))</div>
-<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;      <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;  }</div>
+<div class="line"><a name="l00762"></a><span class="lineno">  762</span>&#160;  adaptation_set.SetId(id_);</div>
+<div class="line"><a name="l00763"></a><span class="lineno">  763</span>&#160;  adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;contentType&quot;</span>, content_type_);</div>
+<div class="line"><a name="l00764"></a><span class="lineno">  764</span>&#160;  <span class="keywordflow">if</span> (!lang_.empty() &amp;&amp; lang_ != <span class="stringliteral">&quot;und&quot;</span>) {</div>
+<div class="line"><a name="l00765"></a><span class="lineno">  765</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;lang&quot;</span>, <a class="code" href="../../d8/daf/namespaceshaka.html#a5f657931280fdf63cae2ed8a8f891288">LanguageToShortestForm</a>(lang_));</div>
+<div class="line"><a name="l00766"></a><span class="lineno">  766</span>&#160;  }</div>
+<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;</div>
+<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160;  <span class="comment">// Note that std::{set,map} are ordered, so the last element is the max value.</span></div>
+<div class="line"><a name="l00769"></a><span class="lineno">  769</span>&#160;  <span class="keywordflow">if</span> (video_widths_.size() == 1) {</div>
+<div class="line"><a name="l00770"></a><span class="lineno">  770</span>&#160;    suppress_representation_width = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00771"></a><span class="lineno">  771</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;width&quot;</span>, *video_widths_.begin());</div>
+<div class="line"><a name="l00772"></a><span class="lineno">  772</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_widths_.size() &gt; 1) {</div>
+<div class="line"><a name="l00773"></a><span class="lineno">  773</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;maxWidth&quot;</span>, *video_widths_.rbegin());</div>
+<div class="line"><a name="l00774"></a><span class="lineno">  774</span>&#160;  }</div>
+<div class="line"><a name="l00775"></a><span class="lineno">  775</span>&#160;  <span class="keywordflow">if</span> (video_heights_.size() == 1) {</div>
+<div class="line"><a name="l00776"></a><span class="lineno">  776</span>&#160;    suppress_representation_height = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;height&quot;</span>, *video_heights_.begin());</div>
+<div class="line"><a name="l00778"></a><span class="lineno">  778</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_heights_.size() &gt; 1) {</div>
+<div class="line"><a name="l00779"></a><span class="lineno">  779</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;maxHeight&quot;</span>, *video_heights_.rbegin());</div>
+<div class="line"><a name="l00780"></a><span class="lineno">  780</span>&#160;  }</div>
+<div class="line"><a name="l00781"></a><span class="lineno">  781</span>&#160;</div>
+<div class="line"><a name="l00782"></a><span class="lineno">  782</span>&#160;  <span class="keywordflow">if</span> (video_frame_rates_.size() == 1) {</div>
+<div class="line"><a name="l00783"></a><span class="lineno">  783</span>&#160;    suppress_representation_frame_rate = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00784"></a><span class="lineno">  784</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;frameRate&quot;</span>,</div>
+<div class="line"><a name="l00785"></a><span class="lineno">  785</span>&#160;                                      video_frame_rates_.begin()-&gt;second);</div>
+<div class="line"><a name="l00786"></a><span class="lineno">  786</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (video_frame_rates_.size() &gt; 1) {</div>
+<div class="line"><a name="l00787"></a><span class="lineno">  787</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;maxFrameRate&quot;</span>,</div>
+<div class="line"><a name="l00788"></a><span class="lineno">  788</span>&#160;                                      video_frame_rates_.rbegin()-&gt;second);</div>
+<div class="line"><a name="l00789"></a><span class="lineno">  789</span>&#160;  }</div>
+<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160;</div>
+<div class="line"><a name="l00791"></a><span class="lineno">  791</span>&#160;  <span class="comment">// Note: must be checked before checking segments_aligned_ (below). So that</span></div>
+<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160;  <span class="comment">// segments_aligned_ is set before checking below.</span></div>
+<div class="line"><a name="l00793"></a><span class="lineno">  793</span>&#160;  <span class="keywordflow">if</span> (mpd_type_ == MpdBuilder::kStatic) {</div>
+<div class="line"><a name="l00794"></a><span class="lineno">  794</span>&#160;    CheckVodSegmentAlignment();</div>
+<div class="line"><a name="l00795"></a><span class="lineno">  795</span>&#160;  }</div>
+<div class="line"><a name="l00796"></a><span class="lineno">  796</span>&#160;</div>
+<div class="line"><a name="l00797"></a><span class="lineno">  797</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentTrue) {</div>
+<div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160;    adaptation_set.SetStringAttribute(mpd_type_ == MpdBuilder::kStatic</div>
+<div class="line"><a name="l00799"></a><span class="lineno">  799</span>&#160;                                          ? <span class="stringliteral">&quot;subsegmentAlignment&quot;</span></div>
+<div class="line"><a name="l00800"></a><span class="lineno">  800</span>&#160;                                          : <span class="stringliteral">&quot;segmentAlignment&quot;</span>,</div>
+<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;                                      <span class="stringliteral">&quot;true&quot;</span>);</div>
+<div class="line"><a name="l00802"></a><span class="lineno">  802</span>&#160;  }</div>
+<div class="line"><a name="l00803"></a><span class="lineno">  803</span>&#160;</div>
+<div class="line"><a name="l00804"></a><span class="lineno">  804</span>&#160;  <span class="keywordflow">if</span> (picture_aspect_ratio_.size() == 1)</div>
+<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;    adaptation_set.SetStringAttribute(<span class="stringliteral">&quot;par&quot;</span>, *picture_aspect_ratio_.begin());</div>
+<div class="line"><a name="l00806"></a><span class="lineno">  806</span>&#160;</div>
+<div class="line"><a name="l00807"></a><span class="lineno">  807</span>&#160;  <span class="keywordflow">if</span> (group_ &gt;= 0)</div>
+<div class="line"><a name="l00808"></a><span class="lineno">  808</span>&#160;    adaptation_set.SetIntegerAttribute(<span class="stringliteral">&quot;group&quot;</span>, group_);</div>
+<div class="line"><a name="l00809"></a><span class="lineno">  809</span>&#160;</div>
+<div class="line"><a name="l00810"></a><span class="lineno">  810</span>&#160;  <span class="keywordflow">if</span> (!adaptation_set.AddContentProtectionElements(</div>
+<div class="line"><a name="l00811"></a><span class="lineno">  811</span>&#160;          content_protection_elements_)) {</div>
+<div class="line"><a name="l00812"></a><span class="lineno">  812</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l00813"></a><span class="lineno">  813</span>&#160;  }</div>
+<div class="line"><a name="l00814"></a><span class="lineno">  814</span>&#160;  <span class="keywordflow">for</span> (AdaptationSet::Role role : roles_)</div>
+<div class="line"><a name="l00815"></a><span class="lineno">  815</span>&#160;    adaptation_set.AddRoleElement(<span class="stringliteral">&quot;urn:mpeg:dash:role:2011&quot;</span>, RoleToText(role));</div>
+<div class="line"><a name="l00816"></a><span class="lineno">  816</span>&#160;</div>
+<div class="line"><a name="l00817"></a><span class="lineno">  817</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;Representation&gt;&amp; representation :</div>
+<div class="line"><a name="l00818"></a><span class="lineno">  818</span>&#160;       representations_) {</div>
+<div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_width)</div>
+<div class="line"><a name="l00820"></a><span class="lineno">  820</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressWidth);</div>
+<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_height)</div>
+<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressHeight);</div>
+<div class="line"><a name="l00823"></a><span class="lineno">  823</span>&#160;    <span class="keywordflow">if</span> (suppress_representation_frame_rate)</div>
+<div class="line"><a name="l00824"></a><span class="lineno">  824</span>&#160;      representation-&gt;SuppressOnce(Representation::kSuppressFrameRate);</div>
+<div class="line"><a name="l00825"></a><span class="lineno">  825</span>&#160;    xml::scoped_xml_ptr&lt;xmlNode&gt; child(representation-&gt;GetXml());</div>
+<div class="line"><a name="l00826"></a><span class="lineno">  826</span>&#160;    <span class="keywordflow">if</span> (!child || !adaptation_set.AddChild(std::move(child)))</div>
+<div class="line"><a name="l00827"></a><span class="lineno">  827</span>&#160;      <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160;  }</div>
+<div class="line"><a name="l00829"></a><span class="lineno">  829</span>&#160;</div>
+<div class="line"><a name="l00830"></a><span class="lineno">  830</span>&#160;  <span class="keywordflow">return</span> adaptation_set.PassScopedPtr();</div>
+<div class="line"><a name="l00831"></a><span class="lineno">  831</span>&#160;}</div>
 <div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160;</div>
-<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160;  <span class="keywordflow">return</span> adaptation_set.PassScopedPtr();</div>
-<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;}</div>
-<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;</div>
-<div class="line"><a name="l00836"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">  836</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">AdaptationSet::ForceSetSegmentAlignment</a>(<span class="keywordtype">bool</span> segment_alignment) {</div>
-<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;  segments_aligned_ =</div>
-<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;      segment_alignment ? kSegmentAlignmentTrue : kSegmentAlignmentFalse;</div>
-<div class="line"><a name="l00839"></a><span class="lineno">  839</span>&#160;  force_set_segment_alignment_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;}</div>
-<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;</div>
-<div class="line"><a name="l00842"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">  842</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">AdaptationSet::SetGroup</a>(<span class="keywordtype">int</span> group_number) {</div>
-<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;  group_ = group_number;</div>
-<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;}</div>
-<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;</div>
-<div class="line"><a name="l00846"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">  846</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">AdaptationSet::Group</a>()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;  <span class="keywordflow">return</span> group_;</div>
-<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;}</div>
-<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;</div>
-<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;<span class="comment">// Check segmentAlignment for Live here. Storing all start_time and duration</span></div>
-<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;<span class="comment">// will out-of-memory because there&#39;s no way of knowing when it will end.</span></div>
-<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;<span class="comment">// VOD subsegmentAlignment check is *not* done here because it is possible</span></div>
-<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;<span class="comment">// that some Representations might not have been added yet (e.g. a thread is</span></div>
-<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160;<span class="comment">// assigned per muxer so one might run faster than others).</span></div>
-<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;<span class="comment">// To be clear, for Live, all Representations should be added before a</span></div>
-<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;<span class="comment">// segment is added.</span></div>
-<div class="line"><a name="l00857"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">  857</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">AdaptationSet::OnNewSegmentForRepresentation</a>(uint32_t representation_id,</div>
-<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;                                                  uint64_t start_time,</div>
-<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;                                                  uint64_t duration) {</div>
-<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;  <span class="keywordflow">if</span> (mpd_type_ == MpdBuilder::kDynamic) {</div>
-<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;    CheckLiveSegmentAlignment(representation_id, start_time, duration);</div>
-<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;    representation_segment_start_times_[representation_id].push_back(</div>
-<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;        start_time);</div>
-<div class="line"><a name="l00865"></a><span class="lineno">  865</span>&#160;  }</div>
-<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;}</div>
-<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;</div>
-<div class="line"><a name="l00868"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">  868</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">AdaptationSet::OnSetFrameRateForRepresentation</a>(</div>
-<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;    uint32_t representation_id,</div>
-<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;    uint32_t frame_duration,</div>
-<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;    uint32_t timescale) {</div>
-<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;  RecordFrameRate(frame_duration, timescale);</div>
-<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;}</div>
+<div class="line"><a name="l00833"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">  833</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">AdaptationSet::ForceSetSegmentAlignment</a>(<span class="keywordtype">bool</span> segment_alignment) {</div>
+<div class="line"><a name="l00834"></a><span class="lineno">  834</span>&#160;  segments_aligned_ =</div>
+<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160;      segment_alignment ? kSegmentAlignmentTrue : kSegmentAlignmentFalse;</div>
+<div class="line"><a name="l00836"></a><span class="lineno">  836</span>&#160;  force_set_segment_alignment_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00837"></a><span class="lineno">  837</span>&#160;}</div>
+<div class="line"><a name="l00838"></a><span class="lineno">  838</span>&#160;</div>
+<div class="line"><a name="l00839"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">  839</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">AdaptationSet::SetGroup</a>(<span class="keywordtype">int</span> group_number) {</div>
+<div class="line"><a name="l00840"></a><span class="lineno">  840</span>&#160;  group_ = group_number;</div>
+<div class="line"><a name="l00841"></a><span class="lineno">  841</span>&#160;}</div>
+<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160;</div>
+<div class="line"><a name="l00843"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">  843</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">AdaptationSet::Group</a>()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00844"></a><span class="lineno">  844</span>&#160;  <span class="keywordflow">return</span> group_;</div>
+<div class="line"><a name="l00845"></a><span class="lineno">  845</span>&#160;}</div>
+<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160;</div>
+<div class="line"><a name="l00847"></a><span class="lineno">  847</span>&#160;<span class="comment">// Check segmentAlignment for Live here. Storing all start_time and duration</span></div>
+<div class="line"><a name="l00848"></a><span class="lineno">  848</span>&#160;<span class="comment">// will out-of-memory because there&#39;s no way of knowing when it will end.</span></div>
+<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160;<span class="comment">// VOD subsegmentAlignment check is *not* done here because it is possible</span></div>
+<div class="line"><a name="l00850"></a><span class="lineno">  850</span>&#160;<span class="comment">// that some Representations might not have been added yet (e.g. a thread is</span></div>
+<div class="line"><a name="l00851"></a><span class="lineno">  851</span>&#160;<span class="comment">// assigned per muxer so one might run faster than others).</span></div>
+<div class="line"><a name="l00852"></a><span class="lineno">  852</span>&#160;<span class="comment">// To be clear, for Live, all Representations should be added before a</span></div>
+<div class="line"><a name="l00853"></a><span class="lineno">  853</span>&#160;<span class="comment">// segment is added.</span></div>
+<div class="line"><a name="l00854"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">  854</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">AdaptationSet::OnNewSegmentForRepresentation</a>(uint32_t representation_id,</div>
+<div class="line"><a name="l00855"></a><span class="lineno">  855</span>&#160;                                                  uint64_t start_time,</div>
+<div class="line"><a name="l00856"></a><span class="lineno">  856</span>&#160;                                                  uint64_t duration) {</div>
+<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160;  <span class="keywordflow">if</span> (mpd_type_ == MpdBuilder::kDynamic) {</div>
+<div class="line"><a name="l00858"></a><span class="lineno">  858</span>&#160;    CheckLiveSegmentAlignment(representation_id, start_time, duration);</div>
+<div class="line"><a name="l00859"></a><span class="lineno">  859</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00860"></a><span class="lineno">  860</span>&#160;    representation_segment_start_times_[representation_id].push_back(</div>
+<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160;        start_time);</div>
+<div class="line"><a name="l00862"></a><span class="lineno">  862</span>&#160;  }</div>
+<div class="line"><a name="l00863"></a><span class="lineno">  863</span>&#160;}</div>
+<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160;</div>
+<div class="line"><a name="l00865"></a><span class="lineno"><a class="line" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">  865</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">AdaptationSet::OnSetFrameRateForRepresentation</a>(</div>
+<div class="line"><a name="l00866"></a><span class="lineno">  866</span>&#160;    uint32_t representation_id,</div>
+<div class="line"><a name="l00867"></a><span class="lineno">  867</span>&#160;    uint32_t frame_duration,</div>
+<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160;    uint32_t timescale) {</div>
+<div class="line"><a name="l00869"></a><span class="lineno">  869</span>&#160;  RecordFrameRate(frame_duration, timescale);</div>
+<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160;}</div>
+<div class="line"><a name="l00871"></a><span class="lineno">  871</span>&#160;</div>
+<div class="line"><a name="l00872"></a><span class="lineno">  872</span>&#160;<span class="keywordtype">bool</span> AdaptationSet::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
+<div class="line"><a name="l00873"></a><span class="lineno">  873</span>&#160;  DCHECK(timestamp_seconds);</div>
 <div class="line"><a name="l00874"></a><span class="lineno">  874</span>&#160;</div>
-<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;<span class="keywordtype">bool</span> AdaptationSet::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
-<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;  DCHECK(timestamp_seconds);</div>
-<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;</div>
-<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;  <span class="keywordtype">double</span> earliest_timestamp(-1);</div>
-<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;Representation*&gt;::const_iterator iter =</div>
-<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;           representations_.begin();</div>
-<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;       iter != representations_.end(); ++iter) {</div>
-<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;    <span class="keywordtype">double</span> timestamp;</div>
-<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;    <span class="keywordflow">if</span> ((*iter)-&gt;GetEarliestTimestamp(&amp;timestamp) &amp;&amp;</div>
-<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;        ((earliest_timestamp &lt; 0) || (timestamp &lt; earliest_timestamp))) {</div>
-<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;      earliest_timestamp = timestamp;</div>
-<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;    }</div>
-<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;  }</div>
-<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;  <span class="keywordflow">if</span> (earliest_timestamp &lt; 0)</div>
-<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00875"></a><span class="lineno">  875</span>&#160;  <span class="keywordtype">double</span> earliest_timestamp(-1);</div>
+<div class="line"><a name="l00876"></a><span class="lineno">  876</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">const</span> std::unique_ptr&lt;Representation&gt;&amp; representation :</div>
+<div class="line"><a name="l00877"></a><span class="lineno">  877</span>&#160;       representations_) {</div>
+<div class="line"><a name="l00878"></a><span class="lineno">  878</span>&#160;    <span class="keywordtype">double</span> timestamp;</div>
+<div class="line"><a name="l00879"></a><span class="lineno">  879</span>&#160;    <span class="keywordflow">if</span> (representation-&gt;GetEarliestTimestamp(&amp;timestamp) &amp;&amp;</div>
+<div class="line"><a name="l00880"></a><span class="lineno">  880</span>&#160;        ((earliest_timestamp &lt; 0) || (timestamp &lt; earliest_timestamp))) {</div>
+<div class="line"><a name="l00881"></a><span class="lineno">  881</span>&#160;      earliest_timestamp = timestamp;</div>
+<div class="line"><a name="l00882"></a><span class="lineno">  882</span>&#160;    }</div>
+<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160;  }</div>
+<div class="line"><a name="l00884"></a><span class="lineno">  884</span>&#160;  <span class="keywordflow">if</span> (earliest_timestamp &lt; 0)</div>
+<div class="line"><a name="l00885"></a><span class="lineno">  885</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160;</div>
+<div class="line"><a name="l00887"></a><span class="lineno">  887</span>&#160;  *timestamp_seconds = earliest_timestamp;</div>
+<div class="line"><a name="l00888"></a><span class="lineno">  888</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160;}</div>
 <div class="line"><a name="l00890"></a><span class="lineno">  890</span>&#160;</div>
-<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;  *timestamp_seconds = earliest_timestamp;</div>
-<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;}</div>
-<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;</div>
-<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;<span class="comment">// This implementation assumes that each representations&#39; segments&#39; are</span></div>
-<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;<span class="comment">// contiguous.</span></div>
-<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;<span class="comment">// Also assumes that all Representations are added before this is called.</span></div>
-<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;<span class="comment">// This checks whether the first elements of the lists in</span></div>
-<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;<span class="comment">// representation_segment_start_times_ are aligned.</span></div>
-<div class="line"><a name="l00900"></a><span class="lineno">  900</span>&#160;<span class="comment">// For example, suppose this method was just called with args rep_id=2</span></div>
-<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;<span class="comment">// start_time=1.</span></div>
-<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;<span class="comment">// 1 -&gt; [1, 100, 200]</span></div>
-<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;<span class="comment">// 2 -&gt; [1]</span></div>
-<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;<span class="comment">// The timestamps of the first elements match, so this flags</span></div>
-<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;<span class="comment">// segments_aligned_=true.</span></div>
-<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;<span class="comment">// Also since the first segment start times match, the first element of all the</span></div>
-<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;<span class="comment">// lists are removed, so the map of lists becomes:</span></div>
-<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;<span class="comment">// 1 -&gt; [100, 200]</span></div>
-<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;<span class="comment">// 2 -&gt; []</span></div>
-<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;<span class="comment">// Note that there could be false positives.</span></div>
-<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;<span class="comment">// e.g. just got rep_id=3 start_time=1 duration=300, and the duration of the</span></div>
-<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;<span class="comment">// whole AdaptationSet is 300.</span></div>
-<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;<span class="comment">// 1 -&gt; [1, 100, 200]</span></div>
-<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;<span class="comment">// 2 -&gt; [1, 90, 100]</span></div>
-<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;<span class="comment">// 3 -&gt; [1]</span></div>
-<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;<span class="comment">// They are not aligned but this will be marked as aligned.</span></div>
-<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;<span class="comment">// But since this is unlikely to happen in the packager (and to save</span></div>
-<div class="line"><a name="l00918"></a><span class="lineno">  918</span>&#160;<span class="comment">// computation), this isn&#39;t handled at the moment.</span></div>
-<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;<span class="keywordtype">void</span> AdaptationSet::CheckLiveSegmentAlignment(uint32_t representation_id,</div>
-<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;                                              uint64_t start_time,</div>
-<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;                                              uint64_t <span class="comment">/* duration */</span>) {</div>
-<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentFalse ||</div>
-<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;      force_set_segment_alignment_) {</div>
-<div class="line"><a name="l00924"></a><span class="lineno">  924</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;  }</div>
-<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;</div>
-<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;  std::list&lt;uint64_t&gt;&amp; representation_start_times =</div>
-<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;      representation_segment_start_times_[representation_id];</div>
-<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;  representation_start_times.push_back(start_time);</div>
-<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;  <span class="comment">// There&#39;s no way to detemine whether the segments are aligned if some</span></div>
-<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;  <span class="comment">// representations do not have any segments.</span></div>
-<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.size() != representations_.size())</div>
-<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;</div>
-<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;  DCHECK(!representation_start_times.empty());</div>
-<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;  <span class="keyword">const</span> uint64_t expected_start_time = representation_start_times.front();</div>
-<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;  <span class="keywordflow">for</span> (RepresentationTimeline::const_iterator it =</div>
-<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;           representation_segment_start_times_.begin();</div>
-<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;       it != representation_segment_start_times_.end(); ++it) {</div>
-<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;    <span class="comment">// If there are no entries in a list, then there is no way for the</span></div>
-<div class="line"><a name="l00941"></a><span class="lineno">  941</span>&#160;    <span class="comment">// segment alignment status to change.</span></div>
-<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;    <span class="comment">// Note that it can be empty because entries get deleted below.</span></div>
-<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;    <span class="keywordflow">if</span> (it-&gt;second.empty())</div>
-<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;      <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;</div>
-<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;    <span class="keywordflow">if</span> (expected_start_time != it-&gt;second.front()) {</div>
-<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;      <span class="comment">// Flag as false and clear the start times data, no need to keep it</span></div>
-<div class="line"><a name="l00948"></a><span class="lineno">  948</span>&#160;      <span class="comment">// around.</span></div>
-<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;      segments_aligned_ = kSegmentAlignmentFalse;</div>
-<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;      representation_segment_start_times_.clear();</div>
-<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;      <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;    }</div>
-<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;  }</div>
-<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;  segments_aligned_ = kSegmentAlignmentTrue;</div>
-<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;</div>
-<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;  <span class="keywordflow">for</span> (RepresentationTimeline::iterator it =</div>
-<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;           representation_segment_start_times_.begin();</div>
-<div class="line"><a name="l00958"></a><span class="lineno">  958</span>&#160;       it != representation_segment_start_times_.end(); ++it) {</div>
-<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;    it-&gt;second.pop_front();</div>
-<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;  }</div>
-<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;}</div>
-<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;</div>
-<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;<span class="comment">// Make sure all segements start times match for all Representations.</span></div>
-<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;<span class="comment">// This assumes that the segments are contiguous.</span></div>
-<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;<span class="keywordtype">void</span> AdaptationSet::CheckVodSegmentAlignment() {</div>
-<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentFalse ||</div>
-<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;      force_set_segment_alignment_) {</div>
-<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;  }</div>
-<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.empty())</div>
-<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.size() == 1) {</div>
-<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;    segments_aligned_ = kSegmentAlignmentTrue;</div>
-<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;  }</div>
-<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;</div>
-<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;  <span class="comment">// This is not the most efficient implementation to compare the values</span></div>
-<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;  <span class="comment">// because expected_time_line is compared against all other time lines, but</span></div>
-<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;  <span class="comment">// probably the most readable.</span></div>
-<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;  <span class="keyword">const</span> std::list&lt;uint64_t&gt;&amp; expected_time_line =</div>
-<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;      representation_segment_start_times_.begin()-&gt;second;</div>
-<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;</div>
-<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;  <span class="keywordtype">bool</span> all_segment_time_line_same_length = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;  <span class="comment">// Note that the first entry is skipped because it is expected_time_line.</span></div>
-<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;  RepresentationTimeline::const_iterator it =</div>
-<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;      representation_segment_start_times_.begin();</div>
-<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;  <span class="keywordflow">for</span> (++it; it != representation_segment_start_times_.end(); ++it) {</div>
-<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;&amp; other_time_line = it-&gt;second;</div>
-<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;    <span class="keywordflow">if</span> (expected_time_line.size() != other_time_line.size()) {</div>
-<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;      all_segment_time_line_same_length = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;    }</div>
-<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;</div>
-<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;* longer_list = &amp;other_time_line;</div>
-<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;* shorter_list = &amp;expected_time_line;</div>
-<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;    <span class="keywordflow">if</span> (expected_time_line.size() &gt; other_time_line.size()) {</div>
-<div class="line"><a name="l00996"></a><span class="lineno">  996</span>&#160;      shorter_list = &amp;other_time_line;</div>
-<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;      longer_list = &amp;expected_time_line;</div>
-<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;    }</div>
-<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;</div>
-<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;    <span class="keywordflow">if</span> (!std::equal(shorter_list-&gt;begin(), shorter_list-&gt;end(),</div>
-<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;                    longer_list-&gt;begin())) {</div>
-<div class="line"><a name="l01002"></a><span class="lineno"> 1002</span>&#160;      <span class="comment">// Some segments are definitely unaligned.</span></div>
-<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;      segments_aligned_ = kSegmentAlignmentFalse;</div>
-<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;      representation_segment_start_times_.clear();</div>
-<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;      <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;    }</div>
-<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;  }</div>
-<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;</div>
-<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;  <span class="comment">// TODO(rkuroiwa): The right way to do this is to also check the durations.</span></div>
-<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;  <span class="comment">// For example:</span></div>
-<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;  <span class="comment">// (a)  3 4 5</span></div>
-<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;  <span class="comment">// (b)  3 4 5 6</span></div>
-<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;  <span class="comment">// could be true or false depending on the length of the third segment of (a).</span></div>
-<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;  <span class="comment">// i.e. if length of the third segment is 2, then this is not aligned.</span></div>
-<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;  <span class="keywordflow">if</span> (!all_segment_time_line_same_length) {</div>
-<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;    segments_aligned_ = kSegmentAlignmentUnknown;</div>
-<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;  }</div>
-<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;</div>
-<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;  segments_aligned_ = kSegmentAlignmentTrue;</div>
-<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;}</div>
-<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;</div>
-<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;<span class="comment">// Since all AdaptationSet cares about is the maxFrameRate, representation_id</span></div>
-<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;<span class="comment">// is not passed to this method.</span></div>
-<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;<span class="keywordtype">void</span> AdaptationSet::RecordFrameRate(uint32_t frame_duration,</div>
-<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;                                    uint32_t timescale) {</div>
-<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;  <span class="keywordflow">if</span> (frame_duration == 0) {</div>
-<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Frame duration is 0 and cannot be set.&quot;</span>;</div>
-<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;  }</div>
-<div class="line"><a name="l01031"></a><span class="lineno"> 1031</span>&#160;  video_frame_rates_[<span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(timescale) / frame_duration] =</div>
-<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;      base::IntToString(timescale) + <span class="stringliteral">&quot;/&quot;</span> + base::IntToString(frame_duration);</div>
-<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;}</div>
-<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;</div>
-<div class="line"><a name="l01035"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb"> 1035</a></span>&#160;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation::Representation</a>(</div>
-<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
-<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;    uint32_t <span class="keywordtype">id</span>,</div>
-<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;    std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener)</div>
-<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;    : media_info_(media_info),</div>
-<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;      id_(id),</div>
-<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;      bandwidth_estimator_(<a class="code" href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a>::kUseAllBlocks),</div>
-<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;      mpd_options_(mpd_options),</div>
-<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;      start_number_(1),</div>
-<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;      state_change_listener_(std::move(state_change_listener)),</div>
-<div class="line"><a name="l01046"></a><span class="lineno"> 1046</span>&#160;      output_suppression_flags_(0) {}</div>
-<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;</div>
-<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;Representation::~Representation() {}</div>
-<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;</div>
-<div class="line"><a name="l01050"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e"> 1050</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">Representation::Init</a>() {</div>
-<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;  <span class="keywordflow">if</span> (!AtLeastOneTrue(media_info_.has_video_info(),</div>
-<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;                      media_info_.has_audio_info(),</div>
-<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;                      media_info_.has_text_info())) {</div>
-<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;    <span class="comment">// This is an error. Segment information can be in AdaptationSet, Period, or</span></div>
-<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;    <span class="comment">// MPD but the interface does not provide a way to set them.</span></div>
-<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;    <span class="comment">// See 5.3.9.1 ISO 23009-1:2012 for segment info.</span></div>
-<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Representation needs one of video, audio, or text.&quot;</span>;</div>
-<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;  }</div>
-<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;</div>
-<div class="line"><a name="l01061"></a><span class="lineno"> 1061</span>&#160;  <span class="keywordflow">if</span> (MoreThanOneTrue(media_info_.has_video_info(),</div>
-<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;                      media_info_.has_audio_info(),</div>
-<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;                      media_info_.has_text_info())) {</div>
-<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Only one of VideoInfo, AudioInfo, or TextInfo can be set.&quot;</span>;</div>
-<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;  }</div>
-<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;</div>
-<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;  <span class="keywordflow">if</span> (media_info_.container_type() == MediaInfo::CONTAINER_UNKNOWN) {</div>
-<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;container_type&#39; in MediaInfo cannot be CONTAINER_UNKNOWN.&quot;</span>;</div>
-<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;  }</div>
-<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;</div>
-<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;  <span class="keywordflow">if</span> (media_info_.has_video_info()) {</div>
-<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;    mime_type_ = GetVideoMimeType();</div>
-<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;    <span class="keywordflow">if</span> (!HasRequiredVideoFields(media_info_.video_info())) {</div>
-<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing required fields to create a video Representation.&quot;</span>;</div>
-<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;    }</div>
-<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info_.has_audio_info()) {</div>
-<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;    mime_type_ = GetAudioMimeType();</div>
-<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info_.has_text_info()) {</div>
-<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;    mime_type_ = GetTextMimeType();</div>
-<div class="line"><a name="l01083"></a><span class="lineno"> 1083</span>&#160;  }</div>
-<div class="line"><a name="l01084"></a><span class="lineno"> 1084</span>&#160;</div>
-<div class="line"><a name="l01085"></a><span class="lineno"> 1085</span>&#160;  <span class="keywordflow">if</span> (mime_type_.empty())</div>
-<div class="line"><a name="l01086"></a><span class="lineno"> 1086</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00891"></a><span class="lineno">  891</span>&#160;<span class="comment">// This implementation assumes that each representations&#39; segments&#39; are</span></div>
+<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160;<span class="comment">// contiguous.</span></div>
+<div class="line"><a name="l00893"></a><span class="lineno">  893</span>&#160;<span class="comment">// Also assumes that all Representations are added before this is called.</span></div>
+<div class="line"><a name="l00894"></a><span class="lineno">  894</span>&#160;<span class="comment">// This checks whether the first elements of the lists in</span></div>
+<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160;<span class="comment">// representation_segment_start_times_ are aligned.</span></div>
+<div class="line"><a name="l00896"></a><span class="lineno">  896</span>&#160;<span class="comment">// For example, suppose this method was just called with args rep_id=2</span></div>
+<div class="line"><a name="l00897"></a><span class="lineno">  897</span>&#160;<span class="comment">// start_time=1.</span></div>
+<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160;<span class="comment">// 1 -&gt; [1, 100, 200]</span></div>
+<div class="line"><a name="l00899"></a><span class="lineno">  899</span>&#160;<span class="comment">// 2 -&gt; [1]</span></div>
+<div class="line"><a name="l00900"></a><span class="lineno">  900</span>&#160;<span class="comment">// The timestamps of the first elements match, so this flags</span></div>
+<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160;<span class="comment">// segments_aligned_=true.</span></div>
+<div class="line"><a name="l00902"></a><span class="lineno">  902</span>&#160;<span class="comment">// Also since the first segment start times match, the first element of all the</span></div>
+<div class="line"><a name="l00903"></a><span class="lineno">  903</span>&#160;<span class="comment">// lists are removed, so the map of lists becomes:</span></div>
+<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160;<span class="comment">// 1 -&gt; [100, 200]</span></div>
+<div class="line"><a name="l00905"></a><span class="lineno">  905</span>&#160;<span class="comment">// 2 -&gt; []</span></div>
+<div class="line"><a name="l00906"></a><span class="lineno">  906</span>&#160;<span class="comment">// Note that there could be false positives.</span></div>
+<div class="line"><a name="l00907"></a><span class="lineno">  907</span>&#160;<span class="comment">// e.g. just got rep_id=3 start_time=1 duration=300, and the duration of the</span></div>
+<div class="line"><a name="l00908"></a><span class="lineno">  908</span>&#160;<span class="comment">// whole AdaptationSet is 300.</span></div>
+<div class="line"><a name="l00909"></a><span class="lineno">  909</span>&#160;<span class="comment">// 1 -&gt; [1, 100, 200]</span></div>
+<div class="line"><a name="l00910"></a><span class="lineno">  910</span>&#160;<span class="comment">// 2 -&gt; [1, 90, 100]</span></div>
+<div class="line"><a name="l00911"></a><span class="lineno">  911</span>&#160;<span class="comment">// 3 -&gt; [1]</span></div>
+<div class="line"><a name="l00912"></a><span class="lineno">  912</span>&#160;<span class="comment">// They are not aligned but this will be marked as aligned.</span></div>
+<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160;<span class="comment">// But since this is unlikely to happen in the packager (and to save</span></div>
+<div class="line"><a name="l00914"></a><span class="lineno">  914</span>&#160;<span class="comment">// computation), this isn&#39;t handled at the moment.</span></div>
+<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160;<span class="keywordtype">void</span> AdaptationSet::CheckLiveSegmentAlignment(uint32_t representation_id,</div>
+<div class="line"><a name="l00916"></a><span class="lineno">  916</span>&#160;                                              uint64_t start_time,</div>
+<div class="line"><a name="l00917"></a><span class="lineno">  917</span>&#160;                                              uint64_t <span class="comment">/* duration */</span>) {</div>
+<div class="line"><a name="l00918"></a><span class="lineno">  918</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentFalse ||</div>
+<div class="line"><a name="l00919"></a><span class="lineno">  919</span>&#160;      force_set_segment_alignment_) {</div>
+<div class="line"><a name="l00920"></a><span class="lineno">  920</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00921"></a><span class="lineno">  921</span>&#160;  }</div>
+<div class="line"><a name="l00922"></a><span class="lineno">  922</span>&#160;</div>
+<div class="line"><a name="l00923"></a><span class="lineno">  923</span>&#160;  std::list&lt;uint64_t&gt;&amp; representation_start_times =</div>
+<div class="line"><a name="l00924"></a><span class="lineno">  924</span>&#160;      representation_segment_start_times_[representation_id];</div>
+<div class="line"><a name="l00925"></a><span class="lineno">  925</span>&#160;  representation_start_times.push_back(start_time);</div>
+<div class="line"><a name="l00926"></a><span class="lineno">  926</span>&#160;  <span class="comment">// There&#39;s no way to detemine whether the segments are aligned if some</span></div>
+<div class="line"><a name="l00927"></a><span class="lineno">  927</span>&#160;  <span class="comment">// representations do not have any segments.</span></div>
+<div class="line"><a name="l00928"></a><span class="lineno">  928</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.size() != representations_.size())</div>
+<div class="line"><a name="l00929"></a><span class="lineno">  929</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00930"></a><span class="lineno">  930</span>&#160;</div>
+<div class="line"><a name="l00931"></a><span class="lineno">  931</span>&#160;  DCHECK(!representation_start_times.empty());</div>
+<div class="line"><a name="l00932"></a><span class="lineno">  932</span>&#160;  <span class="keyword">const</span> uint64_t expected_start_time = representation_start_times.front();</div>
+<div class="line"><a name="l00933"></a><span class="lineno">  933</span>&#160;  <span class="keywordflow">for</span> (RepresentationTimeline::const_iterator it =</div>
+<div class="line"><a name="l00934"></a><span class="lineno">  934</span>&#160;           representation_segment_start_times_.begin();</div>
+<div class="line"><a name="l00935"></a><span class="lineno">  935</span>&#160;       it != representation_segment_start_times_.end(); ++it) {</div>
+<div class="line"><a name="l00936"></a><span class="lineno">  936</span>&#160;    <span class="comment">// If there are no entries in a list, then there is no way for the</span></div>
+<div class="line"><a name="l00937"></a><span class="lineno">  937</span>&#160;    <span class="comment">// segment alignment status to change.</span></div>
+<div class="line"><a name="l00938"></a><span class="lineno">  938</span>&#160;    <span class="comment">// Note that it can be empty because entries get deleted below.</span></div>
+<div class="line"><a name="l00939"></a><span class="lineno">  939</span>&#160;    <span class="keywordflow">if</span> (it-&gt;second.empty())</div>
+<div class="line"><a name="l00940"></a><span class="lineno">  940</span>&#160;      <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00941"></a><span class="lineno">  941</span>&#160;</div>
+<div class="line"><a name="l00942"></a><span class="lineno">  942</span>&#160;    <span class="keywordflow">if</span> (expected_start_time != it-&gt;second.front()) {</div>
+<div class="line"><a name="l00943"></a><span class="lineno">  943</span>&#160;      <span class="comment">// Flag as false and clear the start times data, no need to keep it</span></div>
+<div class="line"><a name="l00944"></a><span class="lineno">  944</span>&#160;      <span class="comment">// around.</span></div>
+<div class="line"><a name="l00945"></a><span class="lineno">  945</span>&#160;      segments_aligned_ = kSegmentAlignmentFalse;</div>
+<div class="line"><a name="l00946"></a><span class="lineno">  946</span>&#160;      representation_segment_start_times_.clear();</div>
+<div class="line"><a name="l00947"></a><span class="lineno">  947</span>&#160;      <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00948"></a><span class="lineno">  948</span>&#160;    }</div>
+<div class="line"><a name="l00949"></a><span class="lineno">  949</span>&#160;  }</div>
+<div class="line"><a name="l00950"></a><span class="lineno">  950</span>&#160;  segments_aligned_ = kSegmentAlignmentTrue;</div>
+<div class="line"><a name="l00951"></a><span class="lineno">  951</span>&#160;</div>
+<div class="line"><a name="l00952"></a><span class="lineno">  952</span>&#160;  <span class="keywordflow">for</span> (RepresentationTimeline::iterator it =</div>
+<div class="line"><a name="l00953"></a><span class="lineno">  953</span>&#160;           representation_segment_start_times_.begin();</div>
+<div class="line"><a name="l00954"></a><span class="lineno">  954</span>&#160;       it != representation_segment_start_times_.end(); ++it) {</div>
+<div class="line"><a name="l00955"></a><span class="lineno">  955</span>&#160;    it-&gt;second.pop_front();</div>
+<div class="line"><a name="l00956"></a><span class="lineno">  956</span>&#160;  }</div>
+<div class="line"><a name="l00957"></a><span class="lineno">  957</span>&#160;}</div>
+<div class="line"><a name="l00958"></a><span class="lineno">  958</span>&#160;</div>
+<div class="line"><a name="l00959"></a><span class="lineno">  959</span>&#160;<span class="comment">// Make sure all segements start times match for all Representations.</span></div>
+<div class="line"><a name="l00960"></a><span class="lineno">  960</span>&#160;<span class="comment">// This assumes that the segments are contiguous.</span></div>
+<div class="line"><a name="l00961"></a><span class="lineno">  961</span>&#160;<span class="keywordtype">void</span> AdaptationSet::CheckVodSegmentAlignment() {</div>
+<div class="line"><a name="l00962"></a><span class="lineno">  962</span>&#160;  <span class="keywordflow">if</span> (segments_aligned_ == kSegmentAlignmentFalse ||</div>
+<div class="line"><a name="l00963"></a><span class="lineno">  963</span>&#160;      force_set_segment_alignment_) {</div>
+<div class="line"><a name="l00964"></a><span class="lineno">  964</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00965"></a><span class="lineno">  965</span>&#160;  }</div>
+<div class="line"><a name="l00966"></a><span class="lineno">  966</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.empty())</div>
+<div class="line"><a name="l00967"></a><span class="lineno">  967</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00968"></a><span class="lineno">  968</span>&#160;  <span class="keywordflow">if</span> (representation_segment_start_times_.size() == 1) {</div>
+<div class="line"><a name="l00969"></a><span class="lineno">  969</span>&#160;    segments_aligned_ = kSegmentAlignmentTrue;</div>
+<div class="line"><a name="l00970"></a><span class="lineno">  970</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l00971"></a><span class="lineno">  971</span>&#160;  }</div>
+<div class="line"><a name="l00972"></a><span class="lineno">  972</span>&#160;</div>
+<div class="line"><a name="l00973"></a><span class="lineno">  973</span>&#160;  <span class="comment">// This is not the most efficient implementation to compare the values</span></div>
+<div class="line"><a name="l00974"></a><span class="lineno">  974</span>&#160;  <span class="comment">// because expected_time_line is compared against all other time lines, but</span></div>
+<div class="line"><a name="l00975"></a><span class="lineno">  975</span>&#160;  <span class="comment">// probably the most readable.</span></div>
+<div class="line"><a name="l00976"></a><span class="lineno">  976</span>&#160;  <span class="keyword">const</span> std::list&lt;uint64_t&gt;&amp; expected_time_line =</div>
+<div class="line"><a name="l00977"></a><span class="lineno">  977</span>&#160;      representation_segment_start_times_.begin()-&gt;second;</div>
+<div class="line"><a name="l00978"></a><span class="lineno">  978</span>&#160;</div>
+<div class="line"><a name="l00979"></a><span class="lineno">  979</span>&#160;  <span class="keywordtype">bool</span> all_segment_time_line_same_length = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00980"></a><span class="lineno">  980</span>&#160;  <span class="comment">// Note that the first entry is skipped because it is expected_time_line.</span></div>
+<div class="line"><a name="l00981"></a><span class="lineno">  981</span>&#160;  RepresentationTimeline::const_iterator it =</div>
+<div class="line"><a name="l00982"></a><span class="lineno">  982</span>&#160;      representation_segment_start_times_.begin();</div>
+<div class="line"><a name="l00983"></a><span class="lineno">  983</span>&#160;  <span class="keywordflow">for</span> (++it; it != representation_segment_start_times_.end(); ++it) {</div>
+<div class="line"><a name="l00984"></a><span class="lineno">  984</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;&amp; other_time_line = it-&gt;second;</div>
+<div class="line"><a name="l00985"></a><span class="lineno">  985</span>&#160;    <span class="keywordflow">if</span> (expected_time_line.size() != other_time_line.size()) {</div>
+<div class="line"><a name="l00986"></a><span class="lineno">  986</span>&#160;      all_segment_time_line_same_length = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00987"></a><span class="lineno">  987</span>&#160;    }</div>
+<div class="line"><a name="l00988"></a><span class="lineno">  988</span>&#160;</div>
+<div class="line"><a name="l00989"></a><span class="lineno">  989</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;* longer_list = &amp;other_time_line;</div>
+<div class="line"><a name="l00990"></a><span class="lineno">  990</span>&#160;    <span class="keyword">const</span> std::list&lt;uint64_t&gt;* shorter_list = &amp;expected_time_line;</div>
+<div class="line"><a name="l00991"></a><span class="lineno">  991</span>&#160;    <span class="keywordflow">if</span> (expected_time_line.size() &gt; other_time_line.size()) {</div>
+<div class="line"><a name="l00992"></a><span class="lineno">  992</span>&#160;      shorter_list = &amp;other_time_line;</div>
+<div class="line"><a name="l00993"></a><span class="lineno">  993</span>&#160;      longer_list = &amp;expected_time_line;</div>
+<div class="line"><a name="l00994"></a><span class="lineno">  994</span>&#160;    }</div>
+<div class="line"><a name="l00995"></a><span class="lineno">  995</span>&#160;</div>
+<div class="line"><a name="l00996"></a><span class="lineno">  996</span>&#160;    <span class="keywordflow">if</span> (!std::equal(shorter_list-&gt;begin(), shorter_list-&gt;end(),</div>
+<div class="line"><a name="l00997"></a><span class="lineno">  997</span>&#160;                    longer_list-&gt;begin())) {</div>
+<div class="line"><a name="l00998"></a><span class="lineno">  998</span>&#160;      <span class="comment">// Some segments are definitely unaligned.</span></div>
+<div class="line"><a name="l00999"></a><span class="lineno">  999</span>&#160;      segments_aligned_ = kSegmentAlignmentFalse;</div>
+<div class="line"><a name="l01000"></a><span class="lineno"> 1000</span>&#160;      representation_segment_start_times_.clear();</div>
+<div class="line"><a name="l01001"></a><span class="lineno"> 1001</span>&#160;      <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01002"></a><span class="lineno"> 1002</span>&#160;    }</div>
+<div class="line"><a name="l01003"></a><span class="lineno"> 1003</span>&#160;  }</div>
+<div class="line"><a name="l01004"></a><span class="lineno"> 1004</span>&#160;</div>
+<div class="line"><a name="l01005"></a><span class="lineno"> 1005</span>&#160;  <span class="comment">// TODO(rkuroiwa): The right way to do this is to also check the durations.</span></div>
+<div class="line"><a name="l01006"></a><span class="lineno"> 1006</span>&#160;  <span class="comment">// For example:</span></div>
+<div class="line"><a name="l01007"></a><span class="lineno"> 1007</span>&#160;  <span class="comment">// (a)  3 4 5</span></div>
+<div class="line"><a name="l01008"></a><span class="lineno"> 1008</span>&#160;  <span class="comment">// (b)  3 4 5 6</span></div>
+<div class="line"><a name="l01009"></a><span class="lineno"> 1009</span>&#160;  <span class="comment">// could be true or false depending on the length of the third segment of (a).</span></div>
+<div class="line"><a name="l01010"></a><span class="lineno"> 1010</span>&#160;  <span class="comment">// i.e. if length of the third segment is 2, then this is not aligned.</span></div>
+<div class="line"><a name="l01011"></a><span class="lineno"> 1011</span>&#160;  <span class="keywordflow">if</span> (!all_segment_time_line_same_length) {</div>
+<div class="line"><a name="l01012"></a><span class="lineno"> 1012</span>&#160;    segments_aligned_ = kSegmentAlignmentUnknown;</div>
+<div class="line"><a name="l01013"></a><span class="lineno"> 1013</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01014"></a><span class="lineno"> 1014</span>&#160;  }</div>
+<div class="line"><a name="l01015"></a><span class="lineno"> 1015</span>&#160;</div>
+<div class="line"><a name="l01016"></a><span class="lineno"> 1016</span>&#160;  segments_aligned_ = kSegmentAlignmentTrue;</div>
+<div class="line"><a name="l01017"></a><span class="lineno"> 1017</span>&#160;}</div>
+<div class="line"><a name="l01018"></a><span class="lineno"> 1018</span>&#160;</div>
+<div class="line"><a name="l01019"></a><span class="lineno"> 1019</span>&#160;<span class="comment">// Since all AdaptationSet cares about is the maxFrameRate, representation_id</span></div>
+<div class="line"><a name="l01020"></a><span class="lineno"> 1020</span>&#160;<span class="comment">// is not passed to this method.</span></div>
+<div class="line"><a name="l01021"></a><span class="lineno"> 1021</span>&#160;<span class="keywordtype">void</span> AdaptationSet::RecordFrameRate(uint32_t frame_duration,</div>
+<div class="line"><a name="l01022"></a><span class="lineno"> 1022</span>&#160;                                    uint32_t timescale) {</div>
+<div class="line"><a name="l01023"></a><span class="lineno"> 1023</span>&#160;  <span class="keywordflow">if</span> (frame_duration == 0) {</div>
+<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Frame duration is 0 and cannot be set.&quot;</span>;</div>
+<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160;  }</div>
+<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160;  video_frame_rates_[<span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(timescale) / frame_duration] =</div>
+<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160;      base::IntToString(timescale) + <span class="stringliteral">&quot;/&quot;</span> + base::IntToString(frame_duration);</div>
+<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160;}</div>
+<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160;</div>
+<div class="line"><a name="l01031"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb"> 1031</a></span>&#160;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation::Representation</a>(</div>
+<div class="line"><a name="l01032"></a><span class="lineno"> 1032</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l01033"></a><span class="lineno"> 1033</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a>&amp; mpd_options,</div>
+<div class="line"><a name="l01034"></a><span class="lineno"> 1034</span>&#160;    uint32_t <span class="keywordtype">id</span>,</div>
+<div class="line"><a name="l01035"></a><span class="lineno"> 1035</span>&#160;    std::unique_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener)</div>
+<div class="line"><a name="l01036"></a><span class="lineno"> 1036</span>&#160;    : media_info_(media_info),</div>
+<div class="line"><a name="l01037"></a><span class="lineno"> 1037</span>&#160;      id_(id),</div>
+<div class="line"><a name="l01038"></a><span class="lineno"> 1038</span>&#160;      bandwidth_estimator_(<a class="code" href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a>::kUseAllBlocks),</div>
+<div class="line"><a name="l01039"></a><span class="lineno"> 1039</span>&#160;      mpd_options_(mpd_options),</div>
+<div class="line"><a name="l01040"></a><span class="lineno"> 1040</span>&#160;      start_number_(1),</div>
+<div class="line"><a name="l01041"></a><span class="lineno"> 1041</span>&#160;      state_change_listener_(std::move(state_change_listener)),</div>
+<div class="line"><a name="l01042"></a><span class="lineno"> 1042</span>&#160;      output_suppression_flags_(0) {}</div>
+<div class="line"><a name="l01043"></a><span class="lineno"> 1043</span>&#160;</div>
+<div class="line"><a name="l01044"></a><span class="lineno"> 1044</span>&#160;Representation::~Representation() {}</div>
+<div class="line"><a name="l01045"></a><span class="lineno"> 1045</span>&#160;</div>
+<div class="line"><a name="l01046"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e"> 1046</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">Representation::Init</a>() {</div>
+<div class="line"><a name="l01047"></a><span class="lineno"> 1047</span>&#160;  <span class="keywordflow">if</span> (!AtLeastOneTrue(media_info_.has_video_info(),</div>
+<div class="line"><a name="l01048"></a><span class="lineno"> 1048</span>&#160;                      media_info_.has_audio_info(),</div>
+<div class="line"><a name="l01049"></a><span class="lineno"> 1049</span>&#160;                      media_info_.has_text_info())) {</div>
+<div class="line"><a name="l01050"></a><span class="lineno"> 1050</span>&#160;    <span class="comment">// This is an error. Segment information can be in AdaptationSet, Period, or</span></div>
+<div class="line"><a name="l01051"></a><span class="lineno"> 1051</span>&#160;    <span class="comment">// MPD but the interface does not provide a way to set them.</span></div>
+<div class="line"><a name="l01052"></a><span class="lineno"> 1052</span>&#160;    <span class="comment">// See 5.3.9.1 ISO 23009-1:2012 for segment info.</span></div>
+<div class="line"><a name="l01053"></a><span class="lineno"> 1053</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Representation needs one of video, audio, or text.&quot;</span>;</div>
+<div class="line"><a name="l01054"></a><span class="lineno"> 1054</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01055"></a><span class="lineno"> 1055</span>&#160;  }</div>
+<div class="line"><a name="l01056"></a><span class="lineno"> 1056</span>&#160;</div>
+<div class="line"><a name="l01057"></a><span class="lineno"> 1057</span>&#160;  <span class="keywordflow">if</span> (MoreThanOneTrue(media_info_.has_video_info(),</div>
+<div class="line"><a name="l01058"></a><span class="lineno"> 1058</span>&#160;                      media_info_.has_audio_info(),</div>
+<div class="line"><a name="l01059"></a><span class="lineno"> 1059</span>&#160;                      media_info_.has_text_info())) {</div>
+<div class="line"><a name="l01060"></a><span class="lineno"> 1060</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Only one of VideoInfo, AudioInfo, or TextInfo can be set.&quot;</span>;</div>
+<div class="line"><a name="l01061"></a><span class="lineno"> 1061</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01062"></a><span class="lineno"> 1062</span>&#160;  }</div>
+<div class="line"><a name="l01063"></a><span class="lineno"> 1063</span>&#160;</div>
+<div class="line"><a name="l01064"></a><span class="lineno"> 1064</span>&#160;  <span class="keywordflow">if</span> (media_info_.container_type() == MediaInfo::CONTAINER_UNKNOWN) {</div>
+<div class="line"><a name="l01065"></a><span class="lineno"> 1065</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;&#39;container_type&#39; in MediaInfo cannot be CONTAINER_UNKNOWN.&quot;</span>;</div>
+<div class="line"><a name="l01066"></a><span class="lineno"> 1066</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01067"></a><span class="lineno"> 1067</span>&#160;  }</div>
+<div class="line"><a name="l01068"></a><span class="lineno"> 1068</span>&#160;</div>
+<div class="line"><a name="l01069"></a><span class="lineno"> 1069</span>&#160;  <span class="keywordflow">if</span> (media_info_.has_video_info()) {</div>
+<div class="line"><a name="l01070"></a><span class="lineno"> 1070</span>&#160;    mime_type_ = GetVideoMimeType();</div>
+<div class="line"><a name="l01071"></a><span class="lineno"> 1071</span>&#160;    <span class="keywordflow">if</span> (!HasRequiredVideoFields(media_info_.video_info())) {</div>
+<div class="line"><a name="l01072"></a><span class="lineno"> 1072</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing required fields to create a video Representation.&quot;</span>;</div>
+<div class="line"><a name="l01073"></a><span class="lineno"> 1073</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01074"></a><span class="lineno"> 1074</span>&#160;    }</div>
+<div class="line"><a name="l01075"></a><span class="lineno"> 1075</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info_.has_audio_info()) {</div>
+<div class="line"><a name="l01076"></a><span class="lineno"> 1076</span>&#160;    mime_type_ = GetAudioMimeType();</div>
+<div class="line"><a name="l01077"></a><span class="lineno"> 1077</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (media_info_.has_text_info()) {</div>
+<div class="line"><a name="l01078"></a><span class="lineno"> 1078</span>&#160;    mime_type_ = GetTextMimeType();</div>
+<div class="line"><a name="l01079"></a><span class="lineno"> 1079</span>&#160;  }</div>
+<div class="line"><a name="l01080"></a><span class="lineno"> 1080</span>&#160;</div>
+<div class="line"><a name="l01081"></a><span class="lineno"> 1081</span>&#160;  <span class="keywordflow">if</span> (mime_type_.empty())</div>
+<div class="line"><a name="l01082"></a><span class="lineno"> 1082</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01083"></a><span class="lineno"> 1083</span>&#160;</div>
+<div class="line"><a name="l01084"></a><span class="lineno"> 1084</span>&#160;  codecs_ = GetCodecs(media_info_);</div>
+<div class="line"><a name="l01085"></a><span class="lineno"> 1085</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01086"></a><span class="lineno"> 1086</span>&#160;}</div>
 <div class="line"><a name="l01087"></a><span class="lineno"> 1087</span>&#160;</div>
-<div class="line"><a name="l01088"></a><span class="lineno"> 1088</span>&#160;  codecs_ = GetCodecs(media_info_);</div>
-<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;}</div>
-<div class="line"><a name="l01091"></a><span class="lineno"> 1091</span>&#160;</div>
-<div class="line"><a name="l01092"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d"> 1092</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">Representation::AddContentProtectionElement</a>(</div>
-<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
-<div class="line"><a name="l01094"></a><span class="lineno"> 1094</span>&#160;  content_protection_elements_.push_back(content_protection_element);</div>
-<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;  RemoveDuplicateAttributes(&amp;content_protection_elements_.back());</div>
-<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;}</div>
-<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;</div>
-<div class="line"><a name="l01098"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330"> 1098</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">Representation::UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
-<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;                                                 <span class="keyword">const</span> std::string&amp; pssh) {</div>
-<div class="line"><a name="l01100"></a><span class="lineno"> 1100</span>&#160;  UpdateContentProtectionPsshHelper(drm_uuid, pssh,</div>
-<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;                                    &amp;content_protection_elements_);</div>
-<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;}</div>
-<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;</div>
-<div class="line"><a name="l01104"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932"> 1104</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">Representation::AddNewSegment</a>(uint64_t start_time,</div>
-<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;                                   uint64_t duration,</div>
-<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;                                   uint64_t size) {</div>
-<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;  <span class="keywordflow">if</span> (start_time == 0 &amp;&amp; duration == 0) {</div>
-<div class="line"><a name="l01108"></a><span class="lineno"> 1108</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Got segment with start_time and duration == 0. Ignoring.&quot;</span>;</div>
-<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;  }</div>
-<div class="line"><a name="l01111"></a><span class="lineno"> 1111</span>&#160;</div>
-<div class="line"><a name="l01112"></a><span class="lineno"> 1112</span>&#160;  <span class="keywordflow">if</span> (state_change_listener_)</div>
-<div class="line"><a name="l01113"></a><span class="lineno"> 1113</span>&#160;    state_change_listener_-&gt;OnNewSegmentForRepresentation(start_time, duration);</div>
-<div class="line"><a name="l01114"></a><span class="lineno"> 1114</span>&#160;  <span class="keywordflow">if</span> (IsContiguous(start_time, duration, size)) {</div>
-<div class="line"><a name="l01115"></a><span class="lineno"> 1115</span>&#160;    ++segment_infos_.back().repeat;</div>
-<div class="line"><a name="l01116"></a><span class="lineno"> 1116</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l01117"></a><span class="lineno"> 1117</span>&#160;    <a class="code" href="../../dc/de1/structshaka_1_1SegmentInfo.html">SegmentInfo</a> s = {start_time, duration, <span class="comment">/* Not repeat. */</span> 0};</div>
-<div class="line"><a name="l01118"></a><span class="lineno"> 1118</span>&#160;    segment_infos_.push_back(s);</div>
-<div class="line"><a name="l01119"></a><span class="lineno"> 1119</span>&#160;  }</div>
-<div class="line"><a name="l01120"></a><span class="lineno"> 1120</span>&#160;</div>
-<div class="line"><a name="l01121"></a><span class="lineno"> 1121</span>&#160;  bandwidth_estimator_.AddBlock(</div>
-<div class="line"><a name="l01122"></a><span class="lineno"> 1122</span>&#160;      size, static_cast&lt;double&gt;(duration) / media_info_.reference_time_scale());</div>
+<div class="line"><a name="l01088"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d"> 1088</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">Representation::AddContentProtectionElement</a>(</div>
+<div class="line"><a name="l01089"></a><span class="lineno"> 1089</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a>&amp; content_protection_element) {</div>
+<div class="line"><a name="l01090"></a><span class="lineno"> 1090</span>&#160;  content_protection_elements_.push_back(content_protection_element);</div>
+<div class="line"><a name="l01091"></a><span class="lineno"> 1091</span>&#160;  RemoveDuplicateAttributes(&amp;content_protection_elements_.back());</div>
+<div class="line"><a name="l01092"></a><span class="lineno"> 1092</span>&#160;}</div>
+<div class="line"><a name="l01093"></a><span class="lineno"> 1093</span>&#160;</div>
+<div class="line"><a name="l01094"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330"> 1094</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">Representation::UpdateContentProtectionPssh</a>(<span class="keyword">const</span> std::string&amp; drm_uuid,</div>
+<div class="line"><a name="l01095"></a><span class="lineno"> 1095</span>&#160;                                                 <span class="keyword">const</span> std::string&amp; pssh) {</div>
+<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160;  UpdateContentProtectionPsshHelper(drm_uuid, pssh,</div>
+<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160;                                    &amp;content_protection_elements_);</div>
+<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160;}</div>
+<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160;</div>
+<div class="line"><a name="l01100"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932"> 1100</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">Representation::AddNewSegment</a>(uint64_t start_time,</div>
+<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160;                                   uint64_t duration,</div>
+<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160;                                   uint64_t size) {</div>
+<div class="line"><a name="l01103"></a><span class="lineno"> 1103</span>&#160;  <span class="keywordflow">if</span> (start_time == 0 &amp;&amp; duration == 0) {</div>
+<div class="line"><a name="l01104"></a><span class="lineno"> 1104</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Got segment with start_time and duration == 0. Ignoring.&quot;</span>;</div>
+<div class="line"><a name="l01105"></a><span class="lineno"> 1105</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01106"></a><span class="lineno"> 1106</span>&#160;  }</div>
+<div class="line"><a name="l01107"></a><span class="lineno"> 1107</span>&#160;</div>
+<div class="line"><a name="l01108"></a><span class="lineno"> 1108</span>&#160;  <span class="keywordflow">if</span> (state_change_listener_)</div>
+<div class="line"><a name="l01109"></a><span class="lineno"> 1109</span>&#160;    state_change_listener_-&gt;OnNewSegmentForRepresentation(start_time, duration);</div>
+<div class="line"><a name="l01110"></a><span class="lineno"> 1110</span>&#160;  <span class="keywordflow">if</span> (IsContiguous(start_time, duration, size)) {</div>
+<div class="line"><a name="l01111"></a><span class="lineno"> 1111</span>&#160;    ++segment_infos_.back().repeat;</div>
+<div class="line"><a name="l01112"></a><span class="lineno"> 1112</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l01113"></a><span class="lineno"> 1113</span>&#160;    <a class="code" href="../../dc/de1/structshaka_1_1SegmentInfo.html">SegmentInfo</a> s = {start_time, duration, <span class="comment">/* Not repeat. */</span> 0};</div>
+<div class="line"><a name="l01114"></a><span class="lineno"> 1114</span>&#160;    segment_infos_.push_back(s);</div>
+<div class="line"><a name="l01115"></a><span class="lineno"> 1115</span>&#160;  }</div>
+<div class="line"><a name="l01116"></a><span class="lineno"> 1116</span>&#160;</div>
+<div class="line"><a name="l01117"></a><span class="lineno"> 1117</span>&#160;  bandwidth_estimator_.AddBlock(</div>
+<div class="line"><a name="l01118"></a><span class="lineno"> 1118</span>&#160;      size, static_cast&lt;double&gt;(duration) / media_info_.reference_time_scale());</div>
+<div class="line"><a name="l01119"></a><span class="lineno"> 1119</span>&#160;</div>
+<div class="line"><a name="l01120"></a><span class="lineno"> 1120</span>&#160;  SlideWindow();</div>
+<div class="line"><a name="l01121"></a><span class="lineno"> 1121</span>&#160;  DCHECK_GE(segment_infos_.size(), 1u);</div>
+<div class="line"><a name="l01122"></a><span class="lineno"> 1122</span>&#160;}</div>
 <div class="line"><a name="l01123"></a><span class="lineno"> 1123</span>&#160;</div>
-<div class="line"><a name="l01124"></a><span class="lineno"> 1124</span>&#160;  SlideWindow();</div>
-<div class="line"><a name="l01125"></a><span class="lineno"> 1125</span>&#160;  DCHECK_GE(segment_infos_.size(), 1u);</div>
-<div class="line"><a name="l01126"></a><span class="lineno"> 1126</span>&#160;}</div>
-<div class="line"><a name="l01127"></a><span class="lineno"> 1127</span>&#160;</div>
-<div class="line"><a name="l01128"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98"> 1128</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">Representation::SetSampleDuration</a>(uint32_t sample_duration) {</div>
-<div class="line"><a name="l01129"></a><span class="lineno"> 1129</span>&#160;  <span class="keywordflow">if</span> (media_info_.has_video_info()) {</div>
-<div class="line"><a name="l01130"></a><span class="lineno"> 1130</span>&#160;    media_info_.mutable_video_info()-&gt;set_frame_duration(sample_duration);</div>
-<div class="line"><a name="l01131"></a><span class="lineno"> 1131</span>&#160;    <span class="keywordflow">if</span> (state_change_listener_) {</div>
-<div class="line"><a name="l01132"></a><span class="lineno"> 1132</span>&#160;      state_change_listener_-&gt;OnSetFrameRateForRepresentation(</div>
-<div class="line"><a name="l01133"></a><span class="lineno"> 1133</span>&#160;          sample_duration, media_info_.video_info().time_scale());</div>
-<div class="line"><a name="l01134"></a><span class="lineno"> 1134</span>&#160;    }</div>
-<div class="line"><a name="l01135"></a><span class="lineno"> 1135</span>&#160;  }</div>
-<div class="line"><a name="l01136"></a><span class="lineno"> 1136</span>&#160;}</div>
-<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;</div>
-<div class="line"><a name="l01138"></a><span class="lineno"> 1138</span>&#160;<span class="comment">// Uses info in |media_info_| and |content_protection_elements_| to create a</span></div>
-<div class="line"><a name="l01139"></a><span class="lineno"> 1139</span>&#160;<span class="comment">// &quot;Representation&quot; node.</span></div>
-<div class="line"><a name="l01140"></a><span class="lineno"> 1140</span>&#160;<span class="comment">// MPD schema has strict ordering. The following must be done in order.</span></div>
-<div class="line"><a name="l01141"></a><span class="lineno"> 1141</span>&#160;<span class="comment">// AddVideoInfo() (possibly adds FramePacking elements), AddAudioInfo() (Adds</span></div>
-<div class="line"><a name="l01142"></a><span class="lineno"> 1142</span>&#160;<span class="comment">// AudioChannelConfig elements), AddContentProtectionElements*(), and</span></div>
-<div class="line"><a name="l01143"></a><span class="lineno"> 1143</span>&#160;<span class="comment">// AddVODOnlyInfo() (Adds segment info).</span></div>
-<div class="line"><a name="l01144"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960"> 1144</a></span>&#160;xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">Representation::GetXml</a>() {</div>
-<div class="line"><a name="l01145"></a><span class="lineno"> 1145</span>&#160;  <span class="keywordflow">if</span> (!HasRequiredMediaInfoFields()) {</div>
-<div class="line"><a name="l01146"></a><span class="lineno"> 1146</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing required fields.&quot;</span>;</div>
-<div class="line"><a name="l01147"></a><span class="lineno"> 1147</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01148"></a><span class="lineno"> 1148</span>&#160;  }</div>
+<div class="line"><a name="l01124"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98"> 1124</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">Representation::SetSampleDuration</a>(uint32_t sample_duration) {</div>
+<div class="line"><a name="l01125"></a><span class="lineno"> 1125</span>&#160;  <span class="keywordflow">if</span> (media_info_.has_video_info()) {</div>
+<div class="line"><a name="l01126"></a><span class="lineno"> 1126</span>&#160;    media_info_.mutable_video_info()-&gt;set_frame_duration(sample_duration);</div>
+<div class="line"><a name="l01127"></a><span class="lineno"> 1127</span>&#160;    <span class="keywordflow">if</span> (state_change_listener_) {</div>
+<div class="line"><a name="l01128"></a><span class="lineno"> 1128</span>&#160;      state_change_listener_-&gt;OnSetFrameRateForRepresentation(</div>
+<div class="line"><a name="l01129"></a><span class="lineno"> 1129</span>&#160;          sample_duration, media_info_.video_info().time_scale());</div>
+<div class="line"><a name="l01130"></a><span class="lineno"> 1130</span>&#160;    }</div>
+<div class="line"><a name="l01131"></a><span class="lineno"> 1131</span>&#160;  }</div>
+<div class="line"><a name="l01132"></a><span class="lineno"> 1132</span>&#160;}</div>
+<div class="line"><a name="l01133"></a><span class="lineno"> 1133</span>&#160;</div>
+<div class="line"><a name="l01134"></a><span class="lineno"> 1134</span>&#160;<span class="comment">// Uses info in |media_info_| and |content_protection_elements_| to create a</span></div>
+<div class="line"><a name="l01135"></a><span class="lineno"> 1135</span>&#160;<span class="comment">// &quot;Representation&quot; node.</span></div>
+<div class="line"><a name="l01136"></a><span class="lineno"> 1136</span>&#160;<span class="comment">// MPD schema has strict ordering. The following must be done in order.</span></div>
+<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;<span class="comment">// AddVideoInfo() (possibly adds FramePacking elements), AddAudioInfo() (Adds</span></div>
+<div class="line"><a name="l01138"></a><span class="lineno"> 1138</span>&#160;<span class="comment">// AudioChannelConfig elements), AddContentProtectionElements*(), and</span></div>
+<div class="line"><a name="l01139"></a><span class="lineno"> 1139</span>&#160;<span class="comment">// AddVODOnlyInfo() (Adds segment info).</span></div>
+<div class="line"><a name="l01140"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960"> 1140</a></span>&#160;xml::scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">Representation::GetXml</a>() {</div>
+<div class="line"><a name="l01141"></a><span class="lineno"> 1141</span>&#160;  <span class="keywordflow">if</span> (!HasRequiredMediaInfoFields()) {</div>
+<div class="line"><a name="l01142"></a><span class="lineno"> 1142</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing required fields.&quot;</span>;</div>
+<div class="line"><a name="l01143"></a><span class="lineno"> 1143</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01144"></a><span class="lineno"> 1144</span>&#160;  }</div>
+<div class="line"><a name="l01145"></a><span class="lineno"> 1145</span>&#160;</div>
+<div class="line"><a name="l01146"></a><span class="lineno"> 1146</span>&#160;  <span class="keyword">const</span> uint64_t bandwidth = media_info_.has_bandwidth()</div>
+<div class="line"><a name="l01147"></a><span class="lineno"> 1147</span>&#160;                                 ? media_info_.bandwidth()</div>
+<div class="line"><a name="l01148"></a><span class="lineno"> 1148</span>&#160;                                 : bandwidth_estimator_.Estimate();</div>
 <div class="line"><a name="l01149"></a><span class="lineno"> 1149</span>&#160;</div>
-<div class="line"><a name="l01150"></a><span class="lineno"> 1150</span>&#160;  <span class="keyword">const</span> uint64_t bandwidth = media_info_.has_bandwidth()</div>
-<div class="line"><a name="l01151"></a><span class="lineno"> 1151</span>&#160;                                 ? media_info_.bandwidth()</div>
-<div class="line"><a name="l01152"></a><span class="lineno"> 1152</span>&#160;                                 : bandwidth_estimator_.Estimate();</div>
-<div class="line"><a name="l01153"></a><span class="lineno"> 1153</span>&#160;</div>
-<div class="line"><a name="l01154"></a><span class="lineno"> 1154</span>&#160;  DCHECK(!(HasVODOnlyFields(media_info_) &amp;&amp; HasLiveOnlyFields(media_info_)));</div>
-<div class="line"><a name="l01155"></a><span class="lineno"> 1155</span>&#160;</div>
-<div class="line"><a name="l01156"></a><span class="lineno"> 1156</span>&#160;  RepresentationXmlNode representation;</div>
-<div class="line"><a name="l01157"></a><span class="lineno"> 1157</span>&#160;  <span class="comment">// Mandatory fields for Representation.</span></div>
-<div class="line"><a name="l01158"></a><span class="lineno"> 1158</span>&#160;  representation.SetId(id_);</div>
-<div class="line"><a name="l01159"></a><span class="lineno"> 1159</span>&#160;  representation.SetIntegerAttribute(<span class="stringliteral">&quot;bandwidth&quot;</span>, bandwidth);</div>
-<div class="line"><a name="l01160"></a><span class="lineno"> 1160</span>&#160;  <span class="keywordflow">if</span> (!codecs_.empty())</div>
-<div class="line"><a name="l01161"></a><span class="lineno"> 1161</span>&#160;    representation.SetStringAttribute(<span class="stringliteral">&quot;codecs&quot;</span>, codecs_);</div>
-<div class="line"><a name="l01162"></a><span class="lineno"> 1162</span>&#160;  representation.SetStringAttribute(<span class="stringliteral">&quot;mimeType&quot;</span>, mime_type_);</div>
-<div class="line"><a name="l01163"></a><span class="lineno"> 1163</span>&#160;</div>
-<div class="line"><a name="l01164"></a><span class="lineno"> 1164</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_video_info = media_info_.has_video_info();</div>
-<div class="line"><a name="l01165"></a><span class="lineno"> 1165</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_audio_info = media_info_.has_audio_info();</div>
-<div class="line"><a name="l01166"></a><span class="lineno"> 1166</span>&#160;</div>
-<div class="line"><a name="l01167"></a><span class="lineno"> 1167</span>&#160;  <span class="keywordflow">if</span> (has_video_info &amp;&amp;</div>
-<div class="line"><a name="l01168"></a><span class="lineno"> 1168</span>&#160;      !representation.AddVideoInfo(</div>
-<div class="line"><a name="l01169"></a><span class="lineno"> 1169</span>&#160;          media_info_.video_info(),</div>
-<div class="line"><a name="l01170"></a><span class="lineno"> 1170</span>&#160;          !(output_suppression_flags_ &amp; kSuppressWidth),</div>
-<div class="line"><a name="l01171"></a><span class="lineno"> 1171</span>&#160;          !(output_suppression_flags_ &amp; kSuppressHeight),</div>
-<div class="line"><a name="l01172"></a><span class="lineno"> 1172</span>&#160;          !(output_suppression_flags_ &amp; kSuppressFrameRate))) {</div>
-<div class="line"><a name="l01173"></a><span class="lineno"> 1173</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add video info to Representation XML.&quot;</span>;</div>
-<div class="line"><a name="l01174"></a><span class="lineno"> 1174</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01175"></a><span class="lineno"> 1175</span>&#160;  }</div>
-<div class="line"><a name="l01176"></a><span class="lineno"> 1176</span>&#160;</div>
-<div class="line"><a name="l01177"></a><span class="lineno"> 1177</span>&#160;  <span class="keywordflow">if</span> (has_audio_info &amp;&amp;</div>
-<div class="line"><a name="l01178"></a><span class="lineno"> 1178</span>&#160;      !representation.AddAudioInfo(media_info_.audio_info())) {</div>
-<div class="line"><a name="l01179"></a><span class="lineno"> 1179</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add audio info to Representation XML.&quot;</span>;</div>
-<div class="line"><a name="l01180"></a><span class="lineno"> 1180</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01181"></a><span class="lineno"> 1181</span>&#160;  }</div>
-<div class="line"><a name="l01182"></a><span class="lineno"> 1182</span>&#160;</div>
-<div class="line"><a name="l01183"></a><span class="lineno"> 1183</span>&#160;  <span class="keywordflow">if</span> (!representation.AddContentProtectionElements(</div>
-<div class="line"><a name="l01184"></a><span class="lineno"> 1184</span>&#160;          content_protection_elements_)) {</div>
-<div class="line"><a name="l01185"></a><span class="lineno"> 1185</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01186"></a><span class="lineno"> 1186</span>&#160;  }</div>
-<div class="line"><a name="l01187"></a><span class="lineno"> 1187</span>&#160;</div>
-<div class="line"><a name="l01188"></a><span class="lineno"> 1188</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp;</div>
-<div class="line"><a name="l01189"></a><span class="lineno"> 1189</span>&#160;      !representation.AddVODOnlyInfo(media_info_)) {</div>
-<div class="line"><a name="l01190"></a><span class="lineno"> 1190</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add VOD segment info.&quot;</span>;</div>
-<div class="line"><a name="l01191"></a><span class="lineno"> 1191</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01192"></a><span class="lineno"> 1192</span>&#160;  }</div>
-<div class="line"><a name="l01193"></a><span class="lineno"> 1193</span>&#160;</div>
-<div class="line"><a name="l01194"></a><span class="lineno"> 1194</span>&#160;  <span class="keywordflow">if</span> (HasLiveOnlyFields(media_info_) &amp;&amp;</div>
-<div class="line"><a name="l01195"></a><span class="lineno"> 1195</span>&#160;      !representation.AddLiveOnlyInfo(media_info_, segment_infos_,</div>
-<div class="line"><a name="l01196"></a><span class="lineno"> 1196</span>&#160;                                      start_number_)) {</div>
-<div class="line"><a name="l01197"></a><span class="lineno"> 1197</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add Live info.&quot;</span>;</div>
-<div class="line"><a name="l01198"></a><span class="lineno"> 1198</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
-<div class="line"><a name="l01199"></a><span class="lineno"> 1199</span>&#160;  }</div>
-<div class="line"><a name="l01200"></a><span class="lineno"> 1200</span>&#160;  <span class="comment">// TODO(rkuroiwa): It is likely that all representations have the exact same</span></div>
-<div class="line"><a name="l01201"></a><span class="lineno"> 1201</span>&#160;  <span class="comment">// SegmentTemplate. Optimize and propagate the tag up to AdaptationSet level.</span></div>
+<div class="line"><a name="l01150"></a><span class="lineno"> 1150</span>&#160;  DCHECK(!(HasVODOnlyFields(media_info_) &amp;&amp; HasLiveOnlyFields(media_info_)));</div>
+<div class="line"><a name="l01151"></a><span class="lineno"> 1151</span>&#160;</div>
+<div class="line"><a name="l01152"></a><span class="lineno"> 1152</span>&#160;  RepresentationXmlNode representation;</div>
+<div class="line"><a name="l01153"></a><span class="lineno"> 1153</span>&#160;  <span class="comment">// Mandatory fields for Representation.</span></div>
+<div class="line"><a name="l01154"></a><span class="lineno"> 1154</span>&#160;  representation.SetId(id_);</div>
+<div class="line"><a name="l01155"></a><span class="lineno"> 1155</span>&#160;  representation.SetIntegerAttribute(<span class="stringliteral">&quot;bandwidth&quot;</span>, bandwidth);</div>
+<div class="line"><a name="l01156"></a><span class="lineno"> 1156</span>&#160;  <span class="keywordflow">if</span> (!codecs_.empty())</div>
+<div class="line"><a name="l01157"></a><span class="lineno"> 1157</span>&#160;    representation.SetStringAttribute(<span class="stringliteral">&quot;codecs&quot;</span>, codecs_);</div>
+<div class="line"><a name="l01158"></a><span class="lineno"> 1158</span>&#160;  representation.SetStringAttribute(<span class="stringliteral">&quot;mimeType&quot;</span>, mime_type_);</div>
+<div class="line"><a name="l01159"></a><span class="lineno"> 1159</span>&#160;</div>
+<div class="line"><a name="l01160"></a><span class="lineno"> 1160</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_video_info = media_info_.has_video_info();</div>
+<div class="line"><a name="l01161"></a><span class="lineno"> 1161</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> has_audio_info = media_info_.has_audio_info();</div>
+<div class="line"><a name="l01162"></a><span class="lineno"> 1162</span>&#160;</div>
+<div class="line"><a name="l01163"></a><span class="lineno"> 1163</span>&#160;  <span class="keywordflow">if</span> (has_video_info &amp;&amp;</div>
+<div class="line"><a name="l01164"></a><span class="lineno"> 1164</span>&#160;      !representation.AddVideoInfo(</div>
+<div class="line"><a name="l01165"></a><span class="lineno"> 1165</span>&#160;          media_info_.video_info(),</div>
+<div class="line"><a name="l01166"></a><span class="lineno"> 1166</span>&#160;          !(output_suppression_flags_ &amp; kSuppressWidth),</div>
+<div class="line"><a name="l01167"></a><span class="lineno"> 1167</span>&#160;          !(output_suppression_flags_ &amp; kSuppressHeight),</div>
+<div class="line"><a name="l01168"></a><span class="lineno"> 1168</span>&#160;          !(output_suppression_flags_ &amp; kSuppressFrameRate))) {</div>
+<div class="line"><a name="l01169"></a><span class="lineno"> 1169</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add video info to Representation XML.&quot;</span>;</div>
+<div class="line"><a name="l01170"></a><span class="lineno"> 1170</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01171"></a><span class="lineno"> 1171</span>&#160;  }</div>
+<div class="line"><a name="l01172"></a><span class="lineno"> 1172</span>&#160;</div>
+<div class="line"><a name="l01173"></a><span class="lineno"> 1173</span>&#160;  <span class="keywordflow">if</span> (has_audio_info &amp;&amp;</div>
+<div class="line"><a name="l01174"></a><span class="lineno"> 1174</span>&#160;      !representation.AddAudioInfo(media_info_.audio_info())) {</div>
+<div class="line"><a name="l01175"></a><span class="lineno"> 1175</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add audio info to Representation XML.&quot;</span>;</div>
+<div class="line"><a name="l01176"></a><span class="lineno"> 1176</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01177"></a><span class="lineno"> 1177</span>&#160;  }</div>
+<div class="line"><a name="l01178"></a><span class="lineno"> 1178</span>&#160;</div>
+<div class="line"><a name="l01179"></a><span class="lineno"> 1179</span>&#160;  <span class="keywordflow">if</span> (!representation.AddContentProtectionElements(</div>
+<div class="line"><a name="l01180"></a><span class="lineno"> 1180</span>&#160;          content_protection_elements_)) {</div>
+<div class="line"><a name="l01181"></a><span class="lineno"> 1181</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01182"></a><span class="lineno"> 1182</span>&#160;  }</div>
+<div class="line"><a name="l01183"></a><span class="lineno"> 1183</span>&#160;</div>
+<div class="line"><a name="l01184"></a><span class="lineno"> 1184</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp;</div>
+<div class="line"><a name="l01185"></a><span class="lineno"> 1185</span>&#160;      !representation.AddVODOnlyInfo(media_info_)) {</div>
+<div class="line"><a name="l01186"></a><span class="lineno"> 1186</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add VOD segment info.&quot;</span>;</div>
+<div class="line"><a name="l01187"></a><span class="lineno"> 1187</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01188"></a><span class="lineno"> 1188</span>&#160;  }</div>
+<div class="line"><a name="l01189"></a><span class="lineno"> 1189</span>&#160;</div>
+<div class="line"><a name="l01190"></a><span class="lineno"> 1190</span>&#160;  <span class="keywordflow">if</span> (HasLiveOnlyFields(media_info_) &amp;&amp;</div>
+<div class="line"><a name="l01191"></a><span class="lineno"> 1191</span>&#160;      !representation.AddLiveOnlyInfo(media_info_, segment_infos_,</div>
+<div class="line"><a name="l01192"></a><span class="lineno"> 1192</span>&#160;                                      start_number_)) {</div>
+<div class="line"><a name="l01193"></a><span class="lineno"> 1193</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to add Live info.&quot;</span>;</div>
+<div class="line"><a name="l01194"></a><span class="lineno"> 1194</span>&#160;    <span class="keywordflow">return</span> xml::scoped_xml_ptr&lt;xmlNode&gt;();</div>
+<div class="line"><a name="l01195"></a><span class="lineno"> 1195</span>&#160;  }</div>
+<div class="line"><a name="l01196"></a><span class="lineno"> 1196</span>&#160;  <span class="comment">// TODO(rkuroiwa): It is likely that all representations have the exact same</span></div>
+<div class="line"><a name="l01197"></a><span class="lineno"> 1197</span>&#160;  <span class="comment">// SegmentTemplate. Optimize and propagate the tag up to AdaptationSet level.</span></div>
+<div class="line"><a name="l01198"></a><span class="lineno"> 1198</span>&#160;</div>
+<div class="line"><a name="l01199"></a><span class="lineno"> 1199</span>&#160;  output_suppression_flags_ = 0;</div>
+<div class="line"><a name="l01200"></a><span class="lineno"> 1200</span>&#160;  <span class="keywordflow">return</span> representation.PassScopedPtr();</div>
+<div class="line"><a name="l01201"></a><span class="lineno"> 1201</span>&#160;}</div>
 <div class="line"><a name="l01202"></a><span class="lineno"> 1202</span>&#160;</div>
-<div class="line"><a name="l01203"></a><span class="lineno"> 1203</span>&#160;  output_suppression_flags_ = 0;</div>
-<div class="line"><a name="l01204"></a><span class="lineno"> 1204</span>&#160;  <span class="keywordflow">return</span> representation.PassScopedPtr();</div>
+<div class="line"><a name="l01203"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed"> 1203</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">Representation::SuppressOnce</a>(SuppressFlag flag) {</div>
+<div class="line"><a name="l01204"></a><span class="lineno"> 1204</span>&#160;  output_suppression_flags_ |= flag;</div>
 <div class="line"><a name="l01205"></a><span class="lineno"> 1205</span>&#160;}</div>
 <div class="line"><a name="l01206"></a><span class="lineno"> 1206</span>&#160;</div>
-<div class="line"><a name="l01207"></a><span class="lineno"><a class="line" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed"> 1207</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">Representation::SuppressOnce</a>(SuppressFlag flag) {</div>
-<div class="line"><a name="l01208"></a><span class="lineno"> 1208</span>&#160;  output_suppression_flags_ |= flag;</div>
-<div class="line"><a name="l01209"></a><span class="lineno"> 1209</span>&#160;}</div>
-<div class="line"><a name="l01210"></a><span class="lineno"> 1210</span>&#160;</div>
-<div class="line"><a name="l01211"></a><span class="lineno"> 1211</span>&#160;<span class="keywordtype">bool</span> Representation::HasRequiredMediaInfoFields() {</div>
-<div class="line"><a name="l01212"></a><span class="lineno"> 1212</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp; HasLiveOnlyFields(media_info_)) {</div>
-<div class="line"><a name="l01213"></a><span class="lineno"> 1213</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo cannot have both VOD and Live fields.&quot;</span>;</div>
-<div class="line"><a name="l01214"></a><span class="lineno"> 1214</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01215"></a><span class="lineno"> 1215</span>&#160;  }</div>
-<div class="line"><a name="l01216"></a><span class="lineno"> 1216</span>&#160;</div>
-<div class="line"><a name="l01217"></a><span class="lineno"> 1217</span>&#160;  <span class="keywordflow">if</span> (!media_info_.has_container_type()) {</div>
-<div class="line"><a name="l01218"></a><span class="lineno"> 1218</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing required field: container_type.&quot;</span>;</div>
-<div class="line"><a name="l01219"></a><span class="lineno"> 1219</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01220"></a><span class="lineno"> 1220</span>&#160;  }</div>
-<div class="line"><a name="l01221"></a><span class="lineno"> 1221</span>&#160;</div>
-<div class="line"><a name="l01222"></a><span class="lineno"> 1222</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp; !media_info_.has_bandwidth()) {</div>
-<div class="line"><a name="l01223"></a><span class="lineno"> 1223</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing &#39;bandwidth&#39; field. MediaInfo requires bandwidth for &quot;</span></div>
-<div class="line"><a name="l01224"></a><span class="lineno"> 1224</span>&#160;                  <span class="stringliteral">&quot;static profile for generating a valid MPD.&quot;</span>;</div>
-<div class="line"><a name="l01225"></a><span class="lineno"> 1225</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01226"></a><span class="lineno"> 1226</span>&#160;  }</div>
+<div class="line"><a name="l01207"></a><span class="lineno"> 1207</span>&#160;<span class="keywordtype">bool</span> Representation::HasRequiredMediaInfoFields() {</div>
+<div class="line"><a name="l01208"></a><span class="lineno"> 1208</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp; HasLiveOnlyFields(media_info_)) {</div>
+<div class="line"><a name="l01209"></a><span class="lineno"> 1209</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo cannot have both VOD and Live fields.&quot;</span>;</div>
+<div class="line"><a name="l01210"></a><span class="lineno"> 1210</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01211"></a><span class="lineno"> 1211</span>&#160;  }</div>
+<div class="line"><a name="l01212"></a><span class="lineno"> 1212</span>&#160;</div>
+<div class="line"><a name="l01213"></a><span class="lineno"> 1213</span>&#160;  <span class="keywordflow">if</span> (!media_info_.has_container_type()) {</div>
+<div class="line"><a name="l01214"></a><span class="lineno"> 1214</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing required field: container_type.&quot;</span>;</div>
+<div class="line"><a name="l01215"></a><span class="lineno"> 1215</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01216"></a><span class="lineno"> 1216</span>&#160;  }</div>
+<div class="line"><a name="l01217"></a><span class="lineno"> 1217</span>&#160;</div>
+<div class="line"><a name="l01218"></a><span class="lineno"> 1218</span>&#160;  <span class="keywordflow">if</span> (HasVODOnlyFields(media_info_) &amp;&amp; !media_info_.has_bandwidth()) {</div>
+<div class="line"><a name="l01219"></a><span class="lineno"> 1219</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing &#39;bandwidth&#39; field. MediaInfo requires bandwidth for &quot;</span></div>
+<div class="line"><a name="l01220"></a><span class="lineno"> 1220</span>&#160;                  <span class="stringliteral">&quot;static profile for generating a valid MPD.&quot;</span>;</div>
+<div class="line"><a name="l01221"></a><span class="lineno"> 1221</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01222"></a><span class="lineno"> 1222</span>&#160;  }</div>
+<div class="line"><a name="l01223"></a><span class="lineno"> 1223</span>&#160;</div>
+<div class="line"><a name="l01224"></a><span class="lineno"> 1224</span>&#160;  VLOG_IF(3, HasLiveOnlyFields(media_info_) &amp;&amp; !media_info_.has_bandwidth())</div>
+<div class="line"><a name="l01225"></a><span class="lineno"> 1225</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing field &#39;bandwidth&#39;. Using estimated from &quot;</span></div>
+<div class="line"><a name="l01226"></a><span class="lineno"> 1226</span>&#160;         <span class="stringliteral">&quot;segment size.&quot;</span>;</div>
 <div class="line"><a name="l01227"></a><span class="lineno"> 1227</span>&#160;</div>
-<div class="line"><a name="l01228"></a><span class="lineno"> 1228</span>&#160;  VLOG_IF(3, HasLiveOnlyFields(media_info_) &amp;&amp; !media_info_.has_bandwidth())</div>
-<div class="line"><a name="l01229"></a><span class="lineno"> 1229</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;MediaInfo missing field &#39;bandwidth&#39;. Using estimated from &quot;</span></div>
-<div class="line"><a name="l01230"></a><span class="lineno"> 1230</span>&#160;         <span class="stringliteral">&quot;segment size.&quot;</span>;</div>
-<div class="line"><a name="l01231"></a><span class="lineno"> 1231</span>&#160;</div>
-<div class="line"><a name="l01232"></a><span class="lineno"> 1232</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01233"></a><span class="lineno"> 1233</span>&#160;}</div>
-<div class="line"><a name="l01234"></a><span class="lineno"> 1234</span>&#160;</div>
-<div class="line"><a name="l01235"></a><span class="lineno"> 1235</span>&#160;<span class="keywordtype">bool</span> Representation::IsContiguous(uint64_t start_time,</div>
-<div class="line"><a name="l01236"></a><span class="lineno"> 1236</span>&#160;                                  uint64_t duration,</div>
-<div class="line"><a name="l01237"></a><span class="lineno"> 1237</span>&#160;                                  uint64_t size)<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l01238"></a><span class="lineno"> 1238</span>&#160;  <span class="keywordflow">if</span> (segment_infos_.empty())</div>
-<div class="line"><a name="l01239"></a><span class="lineno"> 1239</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01240"></a><span class="lineno"> 1240</span>&#160;</div>
-<div class="line"><a name="l01241"></a><span class="lineno"> 1241</span>&#160;  <span class="comment">// Contiguous segment.</span></div>
-<div class="line"><a name="l01242"></a><span class="lineno"> 1242</span>&#160;  <span class="keyword">const</span> SegmentInfo&amp; previous = segment_infos_.back();</div>
-<div class="line"><a name="l01243"></a><span class="lineno"> 1243</span>&#160;  <span class="keyword">const</span> uint64_t previous_segment_end_time =</div>
-<div class="line"><a name="l01244"></a><span class="lineno"> 1244</span>&#160;      previous.start_time + previous.duration * (previous.repeat + 1);</div>
-<div class="line"><a name="l01245"></a><span class="lineno"> 1245</span>&#160;  <span class="keywordflow">if</span> (previous_segment_end_time == start_time &amp;&amp;</div>
-<div class="line"><a name="l01246"></a><span class="lineno"> 1246</span>&#160;      segment_infos_.back().duration == duration) {</div>
-<div class="line"><a name="l01247"></a><span class="lineno"> 1247</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01248"></a><span class="lineno"> 1248</span>&#160;  }</div>
-<div class="line"><a name="l01249"></a><span class="lineno"> 1249</span>&#160;</div>
-<div class="line"><a name="l01250"></a><span class="lineno"> 1250</span>&#160;  <span class="comment">// No out of order segments.</span></div>
-<div class="line"><a name="l01251"></a><span class="lineno"> 1251</span>&#160;  <span class="keyword">const</span> uint64_t previous_segment_start_time =</div>
-<div class="line"><a name="l01252"></a><span class="lineno"> 1252</span>&#160;      previous.start_time + previous.duration * previous.repeat;</div>
-<div class="line"><a name="l01253"></a><span class="lineno"> 1253</span>&#160;  <span class="keywordflow">if</span> (previous_segment_start_time &gt;= start_time) {</div>
-<div class="line"><a name="l01254"></a><span class="lineno"> 1254</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Segments should not be out of order segment. Adding segment &quot;</span></div>
-<div class="line"><a name="l01255"></a><span class="lineno"> 1255</span>&#160;                  <span class="stringliteral">&quot;with start_time == &quot;</span></div>
-<div class="line"><a name="l01256"></a><span class="lineno"> 1256</span>&#160;               &lt;&lt; start_time &lt;&lt; <span class="stringliteral">&quot; but the previous segment starts at &quot;</span></div>
-<div class="line"><a name="l01257"></a><span class="lineno"> 1257</span>&#160;               &lt;&lt; previous.start_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l01258"></a><span class="lineno"> 1258</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01259"></a><span class="lineno"> 1259</span>&#160;  }</div>
-<div class="line"><a name="l01260"></a><span class="lineno"> 1260</span>&#160;</div>
-<div class="line"><a name="l01261"></a><span class="lineno"> 1261</span>&#160;  <span class="comment">// A gap since previous.</span></div>
-<div class="line"><a name="l01262"></a><span class="lineno"> 1262</span>&#160;  <span class="keyword">const</span> uint64_t kRoundingErrorGrace = 5;</div>
-<div class="line"><a name="l01263"></a><span class="lineno"> 1263</span>&#160;  <span class="keywordflow">if</span> (previous_segment_end_time + kRoundingErrorGrace &lt; start_time) {</div>
-<div class="line"><a name="l01264"></a><span class="lineno"> 1264</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Found a gap of size &quot;</span></div>
-<div class="line"><a name="l01265"></a><span class="lineno"> 1265</span>&#160;                 &lt;&lt; (start_time - previous_segment_end_time)</div>
-<div class="line"><a name="l01266"></a><span class="lineno"> 1266</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; &gt; kRoundingErrorGrace (&quot;</span> &lt;&lt; kRoundingErrorGrace</div>
-<div class="line"><a name="l01267"></a><span class="lineno"> 1267</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;). The new segment starts at &quot;</span> &lt;&lt; start_time</div>
-<div class="line"><a name="l01268"></a><span class="lineno"> 1268</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; but the previous segment ends at &quot;</span></div>
-<div class="line"><a name="l01269"></a><span class="lineno"> 1269</span>&#160;                 &lt;&lt; previous_segment_end_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l01270"></a><span class="lineno"> 1270</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01271"></a><span class="lineno"> 1271</span>&#160;  }</div>
-<div class="line"><a name="l01272"></a><span class="lineno"> 1272</span>&#160;</div>
-<div class="line"><a name="l01273"></a><span class="lineno"> 1273</span>&#160;  <span class="comment">// No overlapping segments.</span></div>
-<div class="line"><a name="l01274"></a><span class="lineno"> 1274</span>&#160;  <span class="keywordflow">if</span> (start_time &lt; previous_segment_end_time - kRoundingErrorGrace) {</div>
-<div class="line"><a name="l01275"></a><span class="lineno"> 1275</span>&#160;    LOG(WARNING)</div>
-<div class="line"><a name="l01276"></a><span class="lineno"> 1276</span>&#160;        &lt;&lt; <span class="stringliteral">&quot;Segments should not be overlapping. The new segment starts at &quot;</span></div>
-<div class="line"><a name="l01277"></a><span class="lineno"> 1277</span>&#160;        &lt;&lt; start_time &lt;&lt; <span class="stringliteral">&quot; but the previous segment ends at &quot;</span></div>
-<div class="line"><a name="l01278"></a><span class="lineno"> 1278</span>&#160;        &lt;&lt; previous_segment_end_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l01279"></a><span class="lineno"> 1279</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01280"></a><span class="lineno"> 1280</span>&#160;  }</div>
+<div class="line"><a name="l01228"></a><span class="lineno"> 1228</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01229"></a><span class="lineno"> 1229</span>&#160;}</div>
+<div class="line"><a name="l01230"></a><span class="lineno"> 1230</span>&#160;</div>
+<div class="line"><a name="l01231"></a><span class="lineno"> 1231</span>&#160;<span class="keywordtype">bool</span> Representation::IsContiguous(uint64_t start_time,</div>
+<div class="line"><a name="l01232"></a><span class="lineno"> 1232</span>&#160;                                  uint64_t duration,</div>
+<div class="line"><a name="l01233"></a><span class="lineno"> 1233</span>&#160;                                  uint64_t size)<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l01234"></a><span class="lineno"> 1234</span>&#160;  <span class="keywordflow">if</span> (segment_infos_.empty())</div>
+<div class="line"><a name="l01235"></a><span class="lineno"> 1235</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01236"></a><span class="lineno"> 1236</span>&#160;</div>
+<div class="line"><a name="l01237"></a><span class="lineno"> 1237</span>&#160;  <span class="comment">// Contiguous segment.</span></div>
+<div class="line"><a name="l01238"></a><span class="lineno"> 1238</span>&#160;  <span class="keyword">const</span> SegmentInfo&amp; previous = segment_infos_.back();</div>
+<div class="line"><a name="l01239"></a><span class="lineno"> 1239</span>&#160;  <span class="keyword">const</span> uint64_t previous_segment_end_time =</div>
+<div class="line"><a name="l01240"></a><span class="lineno"> 1240</span>&#160;      previous.start_time + previous.duration * (previous.repeat + 1);</div>
+<div class="line"><a name="l01241"></a><span class="lineno"> 1241</span>&#160;  <span class="keywordflow">if</span> (previous_segment_end_time == start_time &amp;&amp;</div>
+<div class="line"><a name="l01242"></a><span class="lineno"> 1242</span>&#160;      segment_infos_.back().duration == duration) {</div>
+<div class="line"><a name="l01243"></a><span class="lineno"> 1243</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01244"></a><span class="lineno"> 1244</span>&#160;  }</div>
+<div class="line"><a name="l01245"></a><span class="lineno"> 1245</span>&#160;</div>
+<div class="line"><a name="l01246"></a><span class="lineno"> 1246</span>&#160;  <span class="comment">// No out of order segments.</span></div>
+<div class="line"><a name="l01247"></a><span class="lineno"> 1247</span>&#160;  <span class="keyword">const</span> uint64_t previous_segment_start_time =</div>
+<div class="line"><a name="l01248"></a><span class="lineno"> 1248</span>&#160;      previous.start_time + previous.duration * previous.repeat;</div>
+<div class="line"><a name="l01249"></a><span class="lineno"> 1249</span>&#160;  <span class="keywordflow">if</span> (previous_segment_start_time &gt;= start_time) {</div>
+<div class="line"><a name="l01250"></a><span class="lineno"> 1250</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Segments should not be out of order segment. Adding segment &quot;</span></div>
+<div class="line"><a name="l01251"></a><span class="lineno"> 1251</span>&#160;                  <span class="stringliteral">&quot;with start_time == &quot;</span></div>
+<div class="line"><a name="l01252"></a><span class="lineno"> 1252</span>&#160;               &lt;&lt; start_time &lt;&lt; <span class="stringliteral">&quot; but the previous segment starts at &quot;</span></div>
+<div class="line"><a name="l01253"></a><span class="lineno"> 1253</span>&#160;               &lt;&lt; previous.start_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l01254"></a><span class="lineno"> 1254</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01255"></a><span class="lineno"> 1255</span>&#160;  }</div>
+<div class="line"><a name="l01256"></a><span class="lineno"> 1256</span>&#160;</div>
+<div class="line"><a name="l01257"></a><span class="lineno"> 1257</span>&#160;  <span class="comment">// A gap since previous.</span></div>
+<div class="line"><a name="l01258"></a><span class="lineno"> 1258</span>&#160;  <span class="keyword">const</span> uint64_t kRoundingErrorGrace = 5;</div>
+<div class="line"><a name="l01259"></a><span class="lineno"> 1259</span>&#160;  <span class="keywordflow">if</span> (previous_segment_end_time + kRoundingErrorGrace &lt; start_time) {</div>
+<div class="line"><a name="l01260"></a><span class="lineno"> 1260</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Found a gap of size &quot;</span></div>
+<div class="line"><a name="l01261"></a><span class="lineno"> 1261</span>&#160;                 &lt;&lt; (start_time - previous_segment_end_time)</div>
+<div class="line"><a name="l01262"></a><span class="lineno"> 1262</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; &gt; kRoundingErrorGrace (&quot;</span> &lt;&lt; kRoundingErrorGrace</div>
+<div class="line"><a name="l01263"></a><span class="lineno"> 1263</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;). The new segment starts at &quot;</span> &lt;&lt; start_time</div>
+<div class="line"><a name="l01264"></a><span class="lineno"> 1264</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; but the previous segment ends at &quot;</span></div>
+<div class="line"><a name="l01265"></a><span class="lineno"> 1265</span>&#160;                 &lt;&lt; previous_segment_end_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l01266"></a><span class="lineno"> 1266</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01267"></a><span class="lineno"> 1267</span>&#160;  }</div>
+<div class="line"><a name="l01268"></a><span class="lineno"> 1268</span>&#160;</div>
+<div class="line"><a name="l01269"></a><span class="lineno"> 1269</span>&#160;  <span class="comment">// No overlapping segments.</span></div>
+<div class="line"><a name="l01270"></a><span class="lineno"> 1270</span>&#160;  <span class="keywordflow">if</span> (start_time &lt; previous_segment_end_time - kRoundingErrorGrace) {</div>
+<div class="line"><a name="l01271"></a><span class="lineno"> 1271</span>&#160;    LOG(WARNING)</div>
+<div class="line"><a name="l01272"></a><span class="lineno"> 1272</span>&#160;        &lt;&lt; <span class="stringliteral">&quot;Segments should not be overlapping. The new segment starts at &quot;</span></div>
+<div class="line"><a name="l01273"></a><span class="lineno"> 1273</span>&#160;        &lt;&lt; start_time &lt;&lt; <span class="stringliteral">&quot; but the previous segment ends at &quot;</span></div>
+<div class="line"><a name="l01274"></a><span class="lineno"> 1274</span>&#160;        &lt;&lt; previous_segment_end_time &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l01275"></a><span class="lineno"> 1275</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01276"></a><span class="lineno"> 1276</span>&#160;  }</div>
+<div class="line"><a name="l01277"></a><span class="lineno"> 1277</span>&#160;</div>
+<div class="line"><a name="l01278"></a><span class="lineno"> 1278</span>&#160;  <span class="comment">// Within rounding error grace but technically not contiguous in terms of MPD.</span></div>
+<div class="line"><a name="l01279"></a><span class="lineno"> 1279</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01280"></a><span class="lineno"> 1280</span>&#160;}</div>
 <div class="line"><a name="l01281"></a><span class="lineno"> 1281</span>&#160;</div>
-<div class="line"><a name="l01282"></a><span class="lineno"> 1282</span>&#160;  <span class="comment">// Within rounding error grace but technically not contiguous in terms of MPD.</span></div>
-<div class="line"><a name="l01283"></a><span class="lineno"> 1283</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01284"></a><span class="lineno"> 1284</span>&#160;}</div>
-<div class="line"><a name="l01285"></a><span class="lineno"> 1285</span>&#160;</div>
-<div class="line"><a name="l01286"></a><span class="lineno"> 1286</span>&#160;<span class="keywordtype">void</span> Representation::SlideWindow() {</div>
-<div class="line"><a name="l01287"></a><span class="lineno"> 1287</span>&#160;  DCHECK(!segment_infos_.empty());</div>
-<div class="line"><a name="l01288"></a><span class="lineno"> 1288</span>&#160;  <span class="keywordflow">if</span> (mpd_options_.time_shift_buffer_depth &lt;= 0.0)</div>
-<div class="line"><a name="l01289"></a><span class="lineno"> 1289</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01290"></a><span class="lineno"> 1290</span>&#160;</div>
-<div class="line"><a name="l01291"></a><span class="lineno"> 1291</span>&#160;  <span class="keyword">const</span> uint32_t time_scale = GetTimeScale(media_info_);</div>
-<div class="line"><a name="l01292"></a><span class="lineno"> 1292</span>&#160;  DCHECK_GT(time_scale, 0u);</div>
-<div class="line"><a name="l01293"></a><span class="lineno"> 1293</span>&#160;</div>
-<div class="line"><a name="l01294"></a><span class="lineno"> 1294</span>&#160;  uint64_t time_shift_buffer_depth =</div>
-<div class="line"><a name="l01295"></a><span class="lineno"> 1295</span>&#160;      <span class="keyword">static_cast&lt;</span>uint64_t<span class="keyword">&gt;</span>(mpd_options_.time_shift_buffer_depth * time_scale);</div>
-<div class="line"><a name="l01296"></a><span class="lineno"> 1296</span>&#160;</div>
-<div class="line"><a name="l01297"></a><span class="lineno"> 1297</span>&#160;  <span class="comment">// The start time of the latest segment is considered the current_play_time,</span></div>
-<div class="line"><a name="l01298"></a><span class="lineno"> 1298</span>&#160;  <span class="comment">// and this should guarantee that the latest segment will stay in the list.</span></div>
-<div class="line"><a name="l01299"></a><span class="lineno"> 1299</span>&#160;  <span class="keyword">const</span> uint64_t current_play_time = LatestSegmentStartTime(segment_infos_);</div>
-<div class="line"><a name="l01300"></a><span class="lineno"> 1300</span>&#160;  <span class="keywordflow">if</span> (current_play_time &lt;= time_shift_buffer_depth)</div>
-<div class="line"><a name="l01301"></a><span class="lineno"> 1301</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01302"></a><span class="lineno"> 1302</span>&#160;</div>
-<div class="line"><a name="l01303"></a><span class="lineno"> 1303</span>&#160;  <span class="keyword">const</span> uint64_t timeshift_limit = current_play_time - time_shift_buffer_depth;</div>
-<div class="line"><a name="l01304"></a><span class="lineno"> 1304</span>&#160;</div>
-<div class="line"><a name="l01305"></a><span class="lineno"> 1305</span>&#160;  <span class="comment">// First remove all the SegmentInfos that are completely out of range, by</span></div>
-<div class="line"><a name="l01306"></a><span class="lineno"> 1306</span>&#160;  <span class="comment">// looking at the very last segment&#39;s end time.</span></div>
-<div class="line"><a name="l01307"></a><span class="lineno"> 1307</span>&#160;  std::list&lt;SegmentInfo&gt;::iterator first = segment_infos_.begin();</div>
-<div class="line"><a name="l01308"></a><span class="lineno"> 1308</span>&#160;  std::list&lt;SegmentInfo&gt;::iterator last = first;</div>
-<div class="line"><a name="l01309"></a><span class="lineno"> 1309</span>&#160;  <span class="keywordtype">size_t</span> num_segments_removed = 0;</div>
-<div class="line"><a name="l01310"></a><span class="lineno"> 1310</span>&#160;  <span class="keywordflow">for</span> (; last != segment_infos_.end(); ++last) {</div>
-<div class="line"><a name="l01311"></a><span class="lineno"> 1311</span>&#160;    <span class="keyword">const</span> uint64_t last_segment_end_time = LastSegmentEndTime(*last);</div>
-<div class="line"><a name="l01312"></a><span class="lineno"> 1312</span>&#160;    <span class="keywordflow">if</span> (timeshift_limit &lt; last_segment_end_time)</div>
-<div class="line"><a name="l01313"></a><span class="lineno"> 1313</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l01314"></a><span class="lineno"> 1314</span>&#160;    num_segments_removed += last-&gt;repeat + 1;</div>
-<div class="line"><a name="l01315"></a><span class="lineno"> 1315</span>&#160;  }</div>
-<div class="line"><a name="l01316"></a><span class="lineno"> 1316</span>&#160;  segment_infos_.erase(first, last);</div>
-<div class="line"><a name="l01317"></a><span class="lineno"> 1317</span>&#160;  start_number_ += num_segments_removed;</div>
+<div class="line"><a name="l01282"></a><span class="lineno"> 1282</span>&#160;<span class="keywordtype">void</span> Representation::SlideWindow() {</div>
+<div class="line"><a name="l01283"></a><span class="lineno"> 1283</span>&#160;  DCHECK(!segment_infos_.empty());</div>
+<div class="line"><a name="l01284"></a><span class="lineno"> 1284</span>&#160;  <span class="keywordflow">if</span> (mpd_options_.time_shift_buffer_depth &lt;= 0.0)</div>
+<div class="line"><a name="l01285"></a><span class="lineno"> 1285</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01286"></a><span class="lineno"> 1286</span>&#160;</div>
+<div class="line"><a name="l01287"></a><span class="lineno"> 1287</span>&#160;  <span class="keyword">const</span> uint32_t time_scale = GetTimeScale(media_info_);</div>
+<div class="line"><a name="l01288"></a><span class="lineno"> 1288</span>&#160;  DCHECK_GT(time_scale, 0u);</div>
+<div class="line"><a name="l01289"></a><span class="lineno"> 1289</span>&#160;</div>
+<div class="line"><a name="l01290"></a><span class="lineno"> 1290</span>&#160;  uint64_t time_shift_buffer_depth =</div>
+<div class="line"><a name="l01291"></a><span class="lineno"> 1291</span>&#160;      <span class="keyword">static_cast&lt;</span>uint64_t<span class="keyword">&gt;</span>(mpd_options_.time_shift_buffer_depth * time_scale);</div>
+<div class="line"><a name="l01292"></a><span class="lineno"> 1292</span>&#160;</div>
+<div class="line"><a name="l01293"></a><span class="lineno"> 1293</span>&#160;  <span class="comment">// The start time of the latest segment is considered the current_play_time,</span></div>
+<div class="line"><a name="l01294"></a><span class="lineno"> 1294</span>&#160;  <span class="comment">// and this should guarantee that the latest segment will stay in the list.</span></div>
+<div class="line"><a name="l01295"></a><span class="lineno"> 1295</span>&#160;  <span class="keyword">const</span> uint64_t current_play_time = LatestSegmentStartTime(segment_infos_);</div>
+<div class="line"><a name="l01296"></a><span class="lineno"> 1296</span>&#160;  <span class="keywordflow">if</span> (current_play_time &lt;= time_shift_buffer_depth)</div>
+<div class="line"><a name="l01297"></a><span class="lineno"> 1297</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01298"></a><span class="lineno"> 1298</span>&#160;</div>
+<div class="line"><a name="l01299"></a><span class="lineno"> 1299</span>&#160;  <span class="keyword">const</span> uint64_t timeshift_limit = current_play_time - time_shift_buffer_depth;</div>
+<div class="line"><a name="l01300"></a><span class="lineno"> 1300</span>&#160;</div>
+<div class="line"><a name="l01301"></a><span class="lineno"> 1301</span>&#160;  <span class="comment">// First remove all the SegmentInfos that are completely out of range, by</span></div>
+<div class="line"><a name="l01302"></a><span class="lineno"> 1302</span>&#160;  <span class="comment">// looking at the very last segment&#39;s end time.</span></div>
+<div class="line"><a name="l01303"></a><span class="lineno"> 1303</span>&#160;  std::list&lt;SegmentInfo&gt;::iterator first = segment_infos_.begin();</div>
+<div class="line"><a name="l01304"></a><span class="lineno"> 1304</span>&#160;  std::list&lt;SegmentInfo&gt;::iterator last = first;</div>
+<div class="line"><a name="l01305"></a><span class="lineno"> 1305</span>&#160;  <span class="keywordtype">size_t</span> num_segments_removed = 0;</div>
+<div class="line"><a name="l01306"></a><span class="lineno"> 1306</span>&#160;  <span class="keywordflow">for</span> (; last != segment_infos_.end(); ++last) {</div>
+<div class="line"><a name="l01307"></a><span class="lineno"> 1307</span>&#160;    <span class="keyword">const</span> uint64_t last_segment_end_time = LastSegmentEndTime(*last);</div>
+<div class="line"><a name="l01308"></a><span class="lineno"> 1308</span>&#160;    <span class="keywordflow">if</span> (timeshift_limit &lt; last_segment_end_time)</div>
+<div class="line"><a name="l01309"></a><span class="lineno"> 1309</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l01310"></a><span class="lineno"> 1310</span>&#160;    num_segments_removed += last-&gt;repeat + 1;</div>
+<div class="line"><a name="l01311"></a><span class="lineno"> 1311</span>&#160;  }</div>
+<div class="line"><a name="l01312"></a><span class="lineno"> 1312</span>&#160;  segment_infos_.erase(first, last);</div>
+<div class="line"><a name="l01313"></a><span class="lineno"> 1313</span>&#160;  start_number_ += num_segments_removed;</div>
+<div class="line"><a name="l01314"></a><span class="lineno"> 1314</span>&#160;</div>
+<div class="line"><a name="l01315"></a><span class="lineno"> 1315</span>&#160;  <span class="comment">// Now some segment in the first SegmentInfo should be left in the list.</span></div>
+<div class="line"><a name="l01316"></a><span class="lineno"> 1316</span>&#160;  SegmentInfo* first_segment_info = &amp;segment_infos_.front();</div>
+<div class="line"><a name="l01317"></a><span class="lineno"> 1317</span>&#160;  DCHECK_LE(timeshift_limit, LastSegmentEndTime(*first_segment_info));</div>
 <div class="line"><a name="l01318"></a><span class="lineno"> 1318</span>&#160;</div>
-<div class="line"><a name="l01319"></a><span class="lineno"> 1319</span>&#160;  <span class="comment">// Now some segment in the first SegmentInfo should be left in the list.</span></div>
-<div class="line"><a name="l01320"></a><span class="lineno"> 1320</span>&#160;  SegmentInfo* first_segment_info = &amp;segment_infos_.front();</div>
-<div class="line"><a name="l01321"></a><span class="lineno"> 1321</span>&#160;  DCHECK_LE(timeshift_limit, LastSegmentEndTime(*first_segment_info));</div>
-<div class="line"><a name="l01322"></a><span class="lineno"> 1322</span>&#160;</div>
-<div class="line"><a name="l01323"></a><span class="lineno"> 1323</span>&#160;  <span class="comment">// Identify which segments should still be in the SegmentInfo.</span></div>
-<div class="line"><a name="l01324"></a><span class="lineno"> 1324</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> repeat_index =</div>
-<div class="line"><a name="l01325"></a><span class="lineno"> 1325</span>&#160;      SearchTimedOutRepeatIndex(timeshift_limit, *first_segment_info);</div>
-<div class="line"><a name="l01326"></a><span class="lineno"> 1326</span>&#160;  CHECK_GE(repeat_index, 0);</div>
-<div class="line"><a name="l01327"></a><span class="lineno"> 1327</span>&#160;  <span class="keywordflow">if</span> (repeat_index == 0)</div>
-<div class="line"><a name="l01328"></a><span class="lineno"> 1328</span>&#160;    <span class="keywordflow">return</span>;</div>
-<div class="line"><a name="l01329"></a><span class="lineno"> 1329</span>&#160;</div>
-<div class="line"><a name="l01330"></a><span class="lineno"> 1330</span>&#160;  first_segment_info-&gt;start_time = first_segment_info-&gt;start_time +</div>
-<div class="line"><a name="l01331"></a><span class="lineno"> 1331</span>&#160;                                   first_segment_info-&gt;duration * repeat_index;</div>
+<div class="line"><a name="l01319"></a><span class="lineno"> 1319</span>&#160;  <span class="comment">// Identify which segments should still be in the SegmentInfo.</span></div>
+<div class="line"><a name="l01320"></a><span class="lineno"> 1320</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">int</span> repeat_index =</div>
+<div class="line"><a name="l01321"></a><span class="lineno"> 1321</span>&#160;      SearchTimedOutRepeatIndex(timeshift_limit, *first_segment_info);</div>
+<div class="line"><a name="l01322"></a><span class="lineno"> 1322</span>&#160;  CHECK_GE(repeat_index, 0);</div>
+<div class="line"><a name="l01323"></a><span class="lineno"> 1323</span>&#160;  <span class="keywordflow">if</span> (repeat_index == 0)</div>
+<div class="line"><a name="l01324"></a><span class="lineno"> 1324</span>&#160;    <span class="keywordflow">return</span>;</div>
+<div class="line"><a name="l01325"></a><span class="lineno"> 1325</span>&#160;</div>
+<div class="line"><a name="l01326"></a><span class="lineno"> 1326</span>&#160;  first_segment_info-&gt;start_time = first_segment_info-&gt;start_time +</div>
+<div class="line"><a name="l01327"></a><span class="lineno"> 1327</span>&#160;                                   first_segment_info-&gt;duration * repeat_index;</div>
+<div class="line"><a name="l01328"></a><span class="lineno"> 1328</span>&#160;</div>
+<div class="line"><a name="l01329"></a><span class="lineno"> 1329</span>&#160;  first_segment_info-&gt;repeat = first_segment_info-&gt;repeat - repeat_index;</div>
+<div class="line"><a name="l01330"></a><span class="lineno"> 1330</span>&#160;  start_number_ += repeat_index;</div>
+<div class="line"><a name="l01331"></a><span class="lineno"> 1331</span>&#160;}</div>
 <div class="line"><a name="l01332"></a><span class="lineno"> 1332</span>&#160;</div>
-<div class="line"><a name="l01333"></a><span class="lineno"> 1333</span>&#160;  first_segment_info-&gt;repeat = first_segment_info-&gt;repeat - repeat_index;</div>
-<div class="line"><a name="l01334"></a><span class="lineno"> 1334</span>&#160;  start_number_ += repeat_index;</div>
+<div class="line"><a name="l01333"></a><span class="lineno"> 1333</span>&#160;std::string Representation::GetVideoMimeType()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l01334"></a><span class="lineno"> 1334</span>&#160;  <span class="keywordflow">return</span> GetMimeType(<span class="stringliteral">&quot;video&quot;</span>, media_info_.container_type());</div>
 <div class="line"><a name="l01335"></a><span class="lineno"> 1335</span>&#160;}</div>
 <div class="line"><a name="l01336"></a><span class="lineno"> 1336</span>&#160;</div>
-<div class="line"><a name="l01337"></a><span class="lineno"> 1337</span>&#160;std::string Representation::GetVideoMimeType()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l01338"></a><span class="lineno"> 1338</span>&#160;  <span class="keywordflow">return</span> GetMimeType(<span class="stringliteral">&quot;video&quot;</span>, media_info_.container_type());</div>
+<div class="line"><a name="l01337"></a><span class="lineno"> 1337</span>&#160;std::string Representation::GetAudioMimeType()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l01338"></a><span class="lineno"> 1338</span>&#160;  <span class="keywordflow">return</span> GetMimeType(<span class="stringliteral">&quot;audio&quot;</span>, media_info_.container_type());</div>
 <div class="line"><a name="l01339"></a><span class="lineno"> 1339</span>&#160;}</div>
 <div class="line"><a name="l01340"></a><span class="lineno"> 1340</span>&#160;</div>
-<div class="line"><a name="l01341"></a><span class="lineno"> 1341</span>&#160;std::string Representation::GetAudioMimeType()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l01342"></a><span class="lineno"> 1342</span>&#160;  <span class="keywordflow">return</span> GetMimeType(<span class="stringliteral">&quot;audio&quot;</span>, media_info_.container_type());</div>
-<div class="line"><a name="l01343"></a><span class="lineno"> 1343</span>&#160;}</div>
-<div class="line"><a name="l01344"></a><span class="lineno"> 1344</span>&#160;</div>
-<div class="line"><a name="l01345"></a><span class="lineno"> 1345</span>&#160;std::string Representation::GetTextMimeType()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l01346"></a><span class="lineno"> 1346</span>&#160;  CHECK(media_info_.has_text_info());</div>
-<div class="line"><a name="l01347"></a><span class="lineno"> 1347</span>&#160;  <span class="keywordflow">if</span> (media_info_.text_info().format() == <span class="stringliteral">&quot;ttml&quot;</span>) {</div>
-<div class="line"><a name="l01348"></a><span class="lineno"> 1348</span>&#160;    <span class="keywordflow">switch</span> (media_info_.container_type()) {</div>
-<div class="line"><a name="l01349"></a><span class="lineno"> 1349</span>&#160;      <span class="keywordflow">case</span> MediaInfo::CONTAINER_TEXT:</div>
-<div class="line"><a name="l01350"></a><span class="lineno"> 1350</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;application/ttml+xml&quot;</span>;</div>
-<div class="line"><a name="l01351"></a><span class="lineno"> 1351</span>&#160;      <span class="keywordflow">case</span> MediaInfo::CONTAINER_MP4:</div>
-<div class="line"><a name="l01352"></a><span class="lineno"> 1352</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;application/mp4&quot;</span>;</div>
-<div class="line"><a name="l01353"></a><span class="lineno"> 1353</span>&#160;      <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l01354"></a><span class="lineno"> 1354</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine MIME type for TTML container: &quot;</span></div>
-<div class="line"><a name="l01355"></a><span class="lineno"> 1355</span>&#160;                   &lt;&lt; media_info_.container_type();</div>
-<div class="line"><a name="l01356"></a><span class="lineno"> 1356</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l01357"></a><span class="lineno"> 1357</span>&#160;    }</div>
-<div class="line"><a name="l01358"></a><span class="lineno"> 1358</span>&#160;  }</div>
-<div class="line"><a name="l01359"></a><span class="lineno"> 1359</span>&#160;  <span class="keywordflow">if</span> (media_info_.text_info().format() == <span class="stringliteral">&quot;vtt&quot;</span>) {</div>
-<div class="line"><a name="l01360"></a><span class="lineno"> 1360</span>&#160;    <span class="keywordflow">if</span> (media_info_.container_type() == MediaInfo::CONTAINER_TEXT) {</div>
-<div class="line"><a name="l01361"></a><span class="lineno"> 1361</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;text/vtt&quot;</span>;</div>
-<div class="line"><a name="l01362"></a><span class="lineno"> 1362</span>&#160;    }</div>
-<div class="line"><a name="l01363"></a><span class="lineno"> 1363</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine MIME type for VTT container: &quot;</span></div>
-<div class="line"><a name="l01364"></a><span class="lineno"> 1364</span>&#160;               &lt;&lt; media_info_.container_type();</div>
-<div class="line"><a name="l01365"></a><span class="lineno"> 1365</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l01366"></a><span class="lineno"> 1366</span>&#160;  }</div>
-<div class="line"><a name="l01367"></a><span class="lineno"> 1367</span>&#160;</div>
-<div class="line"><a name="l01368"></a><span class="lineno"> 1368</span>&#160;  LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot determine MIME type for format: &quot;</span></div>
-<div class="line"><a name="l01369"></a><span class="lineno"> 1369</span>&#160;             &lt;&lt; media_info_.text_info().format()</div>
-<div class="line"><a name="l01370"></a><span class="lineno"> 1370</span>&#160;             &lt;&lt; <span class="stringliteral">&quot; container: &quot;</span> &lt;&lt; media_info_.container_type();</div>
-<div class="line"><a name="l01371"></a><span class="lineno"> 1371</span>&#160;  <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l01372"></a><span class="lineno"> 1372</span>&#160;}</div>
-<div class="line"><a name="l01373"></a><span class="lineno"> 1373</span>&#160;</div>
-<div class="line"><a name="l01374"></a><span class="lineno"> 1374</span>&#160;<span class="keywordtype">bool</span> Representation::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
-<div class="line"><a name="l01375"></a><span class="lineno"> 1375</span>&#160;  DCHECK(timestamp_seconds);</div>
-<div class="line"><a name="l01376"></a><span class="lineno"> 1376</span>&#160;</div>
-<div class="line"><a name="l01377"></a><span class="lineno"> 1377</span>&#160;  <span class="keywordflow">if</span> (segment_infos_.empty())</div>
-<div class="line"><a name="l01378"></a><span class="lineno"> 1378</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l01379"></a><span class="lineno"> 1379</span>&#160;</div>
-<div class="line"><a name="l01380"></a><span class="lineno"> 1380</span>&#160;  *timestamp_seconds = <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(segment_infos_.begin()-&gt;start_time) /</div>
-<div class="line"><a name="l01381"></a><span class="lineno"> 1381</span>&#160;                       GetTimeScale(media_info_);</div>
-<div class="line"><a name="l01382"></a><span class="lineno"> 1382</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l01383"></a><span class="lineno"> 1383</span>&#160;}</div>
-<div class="line"><a name="l01384"></a><span class="lineno"> 1384</span>&#160;</div>
-<div class="line"><a name="l01385"></a><span class="lineno"> 1385</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a37904780833b552b7f95f124ffd10456"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">shaka::AdaptationSet::OnSetFrameRateForRepresentation</a></div><div class="ttdeci">void OnSetFrameRateForRepresentation(uint32_t representation_id, uint32_t frame_duration, uint32_t timescale)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00868">mpd_builder.cc:868</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01104">mpd_builder.cc:1104</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_ae998409ae94f3ba12909a96e8f3f4f7e"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">shaka::Representation::Init</a></div><div class="ttdeci">bool Init()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01050">mpd_builder.cc:1050</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a35685a28f837c397e1f862d44b2205d9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">shaka::MpdBuilder::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(media::File *output_file)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00423">mpd_builder.cc:423</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a997138fcaa5deef5151a64a2d7ce6aeb"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01035">mpd_builder.cc:1035</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_acd24d0537c3625d709b58cf9565d8fcf"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">shaka::AdaptationSet::AdaptationSet</a></div><div class="ttdeci">AdaptationSet(uint32_t adaptation_set_id, const std::string &amp;lang, const MpdOptions &amp;mpd_options, MpdBuilder::MpdType mpd_type, base::AtomicSequenceNumber *representation_counter)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00674">mpd_builder.cc:674</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00167">mpd_builder.h:167</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01128">mpd_builder.cc:1128</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00693">mpd_builder.cc:693</a></div></div>
+<div class="line"><a name="l01341"></a><span class="lineno"> 1341</span>&#160;std::string Representation::GetTextMimeType()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l01342"></a><span class="lineno"> 1342</span>&#160;  CHECK(media_info_.has_text_info());</div>
+<div class="line"><a name="l01343"></a><span class="lineno"> 1343</span>&#160;  <span class="keywordflow">if</span> (media_info_.text_info().format() == <span class="stringliteral">&quot;ttml&quot;</span>) {</div>
+<div class="line"><a name="l01344"></a><span class="lineno"> 1344</span>&#160;    <span class="keywordflow">switch</span> (media_info_.container_type()) {</div>
+<div class="line"><a name="l01345"></a><span class="lineno"> 1345</span>&#160;      <span class="keywordflow">case</span> MediaInfo::CONTAINER_TEXT:</div>
+<div class="line"><a name="l01346"></a><span class="lineno"> 1346</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;application/ttml+xml&quot;</span>;</div>
+<div class="line"><a name="l01347"></a><span class="lineno"> 1347</span>&#160;      <span class="keywordflow">case</span> MediaInfo::CONTAINER_MP4:</div>
+<div class="line"><a name="l01348"></a><span class="lineno"> 1348</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;application/mp4&quot;</span>;</div>
+<div class="line"><a name="l01349"></a><span class="lineno"> 1349</span>&#160;      <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l01350"></a><span class="lineno"> 1350</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine MIME type for TTML container: &quot;</span></div>
+<div class="line"><a name="l01351"></a><span class="lineno"> 1351</span>&#160;                   &lt;&lt; media_info_.container_type();</div>
+<div class="line"><a name="l01352"></a><span class="lineno"> 1352</span>&#160;        <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
+<div class="line"><a name="l01353"></a><span class="lineno"> 1353</span>&#160;    }</div>
+<div class="line"><a name="l01354"></a><span class="lineno"> 1354</span>&#160;  }</div>
+<div class="line"><a name="l01355"></a><span class="lineno"> 1355</span>&#160;  <span class="keywordflow">if</span> (media_info_.text_info().format() == <span class="stringliteral">&quot;vtt&quot;</span>) {</div>
+<div class="line"><a name="l01356"></a><span class="lineno"> 1356</span>&#160;    <span class="keywordflow">if</span> (media_info_.container_type() == MediaInfo::CONTAINER_TEXT) {</div>
+<div class="line"><a name="l01357"></a><span class="lineno"> 1357</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;text/vtt&quot;</span>;</div>
+<div class="line"><a name="l01358"></a><span class="lineno"> 1358</span>&#160;    }</div>
+<div class="line"><a name="l01359"></a><span class="lineno"> 1359</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to determine MIME type for VTT container: &quot;</span></div>
+<div class="line"><a name="l01360"></a><span class="lineno"> 1360</span>&#160;               &lt;&lt; media_info_.container_type();</div>
+<div class="line"><a name="l01361"></a><span class="lineno"> 1361</span>&#160;    <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
+<div class="line"><a name="l01362"></a><span class="lineno"> 1362</span>&#160;  }</div>
+<div class="line"><a name="l01363"></a><span class="lineno"> 1363</span>&#160;</div>
+<div class="line"><a name="l01364"></a><span class="lineno"> 1364</span>&#160;  LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot determine MIME type for format: &quot;</span></div>
+<div class="line"><a name="l01365"></a><span class="lineno"> 1365</span>&#160;             &lt;&lt; media_info_.text_info().format()</div>
+<div class="line"><a name="l01366"></a><span class="lineno"> 1366</span>&#160;             &lt;&lt; <span class="stringliteral">&quot; container: &quot;</span> &lt;&lt; media_info_.container_type();</div>
+<div class="line"><a name="l01367"></a><span class="lineno"> 1367</span>&#160;  <span class="keywordflow">return</span> <span class="stringliteral">&quot;&quot;</span>;</div>
+<div class="line"><a name="l01368"></a><span class="lineno"> 1368</span>&#160;}</div>
+<div class="line"><a name="l01369"></a><span class="lineno"> 1369</span>&#160;</div>
+<div class="line"><a name="l01370"></a><span class="lineno"> 1370</span>&#160;<span class="keywordtype">bool</span> Representation::GetEarliestTimestamp(<span class="keywordtype">double</span>* timestamp_seconds) {</div>
+<div class="line"><a name="l01371"></a><span class="lineno"> 1371</span>&#160;  DCHECK(timestamp_seconds);</div>
+<div class="line"><a name="l01372"></a><span class="lineno"> 1372</span>&#160;</div>
+<div class="line"><a name="l01373"></a><span class="lineno"> 1373</span>&#160;  <span class="keywordflow">if</span> (segment_infos_.empty())</div>
+<div class="line"><a name="l01374"></a><span class="lineno"> 1374</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l01375"></a><span class="lineno"> 1375</span>&#160;</div>
+<div class="line"><a name="l01376"></a><span class="lineno"> 1376</span>&#160;  *timestamp_seconds = <span class="keyword">static_cast&lt;</span><span class="keywordtype">double</span><span class="keyword">&gt;</span>(segment_infos_.begin()-&gt;start_time) /</div>
+<div class="line"><a name="l01377"></a><span class="lineno"> 1377</span>&#160;                       GetTimeScale(media_info_);</div>
+<div class="line"><a name="l01378"></a><span class="lineno"> 1378</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l01379"></a><span class="lineno"> 1379</span>&#160;}</div>
+<div class="line"><a name="l01380"></a><span class="lineno"> 1380</span>&#160;</div>
+<div class="line"><a name="l01381"></a><span class="lineno"> 1381</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a37904780833b552b7f95f124ffd10456"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a37904780833b552b7f95f124ffd10456">shaka::AdaptationSet::OnSetFrameRateForRepresentation</a></div><div class="ttdeci">void OnSetFrameRateForRepresentation(uint32_t representation_id, uint32_t frame_duration, uint32_t timescale)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00865">mpd_builder.cc:865</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a6ca8bbfd34ef8ca782d2ef18aeaad932"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation::AddNewSegment</a></div><div class="ttdeci">virtual void AddNewSegment(uint64_t start_time, uint64_t duration, uint64_t size)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01100">mpd_builder.cc:1100</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_ae998409ae94f3ba12909a96e8f3f4f7e"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e">shaka::Representation::Init</a></div><div class="ttdeci">bool Init()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01046">mpd_builder.cc:1046</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a35685a28f837c397e1f862d44b2205d9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a35685a28f837c397e1f862d44b2205d9">shaka::MpdBuilder::WriteMpdToFile</a></div><div class="ttdeci">bool WriteMpdToFile(media::File *output_file)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00422">mpd_builder.cc:422</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a997138fcaa5deef5151a64a2d7ce6aeb"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01031">mpd_builder.cc:1031</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_acd24d0537c3625d709b58cf9565d8fcf"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#acd24d0537c3625d709b58cf9565d8fcf">shaka::AdaptationSet::AdaptationSet</a></div><div class="ttdeci">AdaptationSet(uint32_t adaptation_set_id, const std::string &amp;lang, const MpdOptions &amp;mpd_options, MpdBuilder::MpdType mpd_type, base::AtomicSequenceNumber *representation_counter)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00671">mpd_builder.cc:671</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html">shaka::AdaptationSet</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00165">mpd_builder.h:165</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a11b32833166b9c4bea78cca2c6069d98"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">shaka::Representation::SetSampleDuration</a></div><div class="ttdeci">virtual void SetSampleDuration(uint32_t sample_duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01124">mpd_builder.cc:1124</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a124e3c1ba5e3209f3214a556ecae28c3"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet::AddRepresentation</a></div><div class="ttdeci">virtual Representation * AddRepresentation(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00689">mpd_builder.cc:689</a></div></div>
 <div class="ttc" id="namespaceshaka_html_a5f657931280fdf63cae2ed8a8f891288"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#a5f657931280fdf63cae2ed8a8f891288">shaka::LanguageToShortestForm</a></div><div class="ttdeci">std::string LanguageToShortestForm(const std::string &amp;language)</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d72/language__utils_8cc_source.html#l00089">language_utils.cc:89</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html">shaka::media::File</a></div><div class="ttdoc">Define an abstract file interface. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d4d/file_8h_source.html#l00024">file.h:24</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00737">mpd_builder.cc:737</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a28c52febc71a581ebec2c1308f6ea15c"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a28c52febc71a581ebec2c1308f6ea15c">shaka::AdaptationSet::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00733">mpd_builder.cc:733</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00749">mpd_builder.cc:749</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_ab6fd968035d1cba5060fe23a107f8bdb"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">shaka::MpdBuilder::AddBaseUrl</a></div><div class="ttdeci">void AddBaseUrl(const std::string &amp;base_url)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00409">mpd_builder.cc:409</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00743">mpd_builder.cc:743</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00842">mpd_builder.cc:842</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a606afa5df6a90f49faad0ce427b7e960"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">shaka::Representation::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01144">mpd_builder.cc:1144</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00428">mpd_builder.cc:428</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00836">mpd_builder.cc:836</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00646">mpd_builder.cc:646</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae96ad89ec7cc7d5ef1db467a9cf13730"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730">shaka::AdaptationSet::AddRole</a></div><div class="ttdeci">virtual void AddRole(Role role)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00745">mpd_builder.cc:745</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_ab6fd968035d1cba5060fe23a107f8bdb"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">shaka::MpdBuilder::AddBaseUrl</a></div><div class="ttdeci">void AddBaseUrl(const std::string &amp;base_url)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00408">mpd_builder.cc:408</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae8a28838bf1bbc1ad8f5b80961fe33c2"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae8a28838bf1bbc1ad8f5b80961fe33c2">shaka::AdaptationSet::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00739">mpd_builder.cc:739</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_ae1f56e719f289e61c27ec51457d697af"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af">shaka::AdaptationSet::SetGroup</a></div><div class="ttdeci">virtual void SetGroup(int group_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00839">mpd_builder.cc:839</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a606afa5df6a90f49faad0ce427b7e960"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">shaka::Representation::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01140">mpd_builder.cc:1140</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_af7eae5cc11141eed2b5451d969e57db6"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#af7eae5cc11141eed2b5451d969e57db6">shaka::MpdBuilder::ToString</a></div><div class="ttdeci">virtual bool ToString(std::string *output)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00427">mpd_builder.cc:427</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a40532ecbed5f71de85bde0cb7eb1ef9d"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a40532ecbed5f71de85bde0cb7eb1ef9d">shaka::AdaptationSet::ForceSetSegmentAlignment</a></div><div class="ttdeci">virtual void ForceSetSegmentAlignment(bool segment_alignment)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00833">mpd_builder.cc:833</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00643">mpd_builder.cc:643</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdBuilder_html_ad22c1e62affefcb33382c9480820c032"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad22c1e62affefcb33382c9480820c032">shaka::MpdBuilder::MpdBuilder</a></div><div class="ttdeci">MpdBuilder(MpdType type, const MpdOptions &amp;mpd_options)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00401">mpd_builder.cc:401</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_af988e3a6d8b0d3ede66e3f3aea992d5e"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">shaka::AdaptationSet::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00759">mpd_builder.cc:759</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01092">mpd_builder.cc:1092</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00428">mpd_builder.h:428</a></div></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00413">mpd_builder.cc:413</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00846">mpd_builder.cc:846</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_af988e3a6d8b0d3ede66e3f3aea992d5e"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#af988e3a6d8b0d3ede66e3f3aea992d5e">shaka::AdaptationSet::GetXml</a></div><div class="ttdeci">xml::scoped_xml_ptr&lt; xmlNode &gt; GetXml()</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00755">mpd_builder.cc:755</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a265d014093c9073b08505013886aaa8d"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a265d014093c9073b08505013886aaa8d">shaka::Representation::AddContentProtectionElement</a></div><div class="ttdeci">virtual void AddContentProtectionElement(const ContentProtectionElement &amp;element)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01088">mpd_builder.cc:1088</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/da3/mpd__builder_8h_source.html#l00425">mpd_builder.h:425</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_ad32d4f20e6325b20267a2e905e1ec243"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">shaka::MpdBuilder::AddAdaptationSet</a></div><div class="ttdeci">virtual AdaptationSet * AddAdaptationSet(const std::string &amp;lang)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00412">mpd_builder.cc:412</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_a1f4285fb3adce2028aa61030e333bc31"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#a1f4285fb3adce2028aa61030e333bc31">shaka::AdaptationSet::Group</a></div><div class="ttdeci">virtual int Group() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00843">mpd_builder.cc:843</a></div></div>
 <div class="ttc" id="structshaka_1_1MpdOptions_html"><div class="ttname"><a href="../../d1/df3/structshaka_1_1MpdOptions.html">shaka::MpdOptions</a></div><div class="ttdoc">Defines Mpd Options. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d60/mpd__options_8h_source.html#l00015">mpd_options.h:15</a></div></div>
-<div class="ttc" id="classshaka_1_1AdaptationSet_html_afcfb8f59204f6ec2f5dcd9cbd81dddf9"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">shaka::AdaptationSet::OnNewSegmentForRepresentation</a></div><div class="ttdeci">void OnNewSegmentForRepresentation(uint32_t representation_id, uint64_t start_time, uint64_t duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00857">mpd_builder.cc:857</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01098">mpd_builder.cc:1098</a></div></div>
+<div class="ttc" id="classshaka_1_1AdaptationSet_html_afcfb8f59204f6ec2f5dcd9cbd81dddf9"><div class="ttname"><a href="../../d8/d8e/classshaka_1_1AdaptationSet.html#afcfb8f59204f6ec2f5dcd9cbd81dddf9">shaka::AdaptationSet::OnNewSegmentForRepresentation</a></div><div class="ttdeci">void OnNewSegmentForRepresentation(uint32_t representation_id, uint64_t start_time, uint64_t duration)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00854">mpd_builder.cc:854</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a3d17325903aa01f0c8ff7753d94ff330"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a3d17325903aa01f0c8ff7753d94ff330">shaka::Representation::UpdateContentProtectionPssh</a></div><div class="ttdeci">virtual void UpdateContentProtectionPssh(const std::string &amp;drm_uuid, const std::string &amp;pssh)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01094">mpd_builder.cc:1094</a></div></div>
 <div class="ttc" id="structshaka_1_1SegmentInfo_html"><div class="ttname"><a href="../../dc/de1/structshaka_1_1SegmentInfo.html">shaka::SegmentInfo</a></div><div class="ttdef"><b>Definition:</b> <a href="../../df/de9/segment__info_8h_source.html#l00014">segment_info.h:14</a></div></div>
 <div class="ttc" id="classBandwidthEstimator_html"><div class="ttname"><a href="../../d2/d6f/classBandwidthEstimator.html">BandwidthEstimator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d19/bandwidth__estimator_8h_source.html#l00015">bandwidth_estimator.h:15</a></div></div>
-<div class="ttc" id="classshaka_1_1Representation_html_a473e45dbbf64e6ab6ed670ccedac84ed"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation::SuppressOnce</a></div><div class="ttdeci">void SuppressOnce(SuppressFlag flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01207">mpd_builder.cc:1207</a></div></div>
+<div class="ttc" id="classshaka_1_1Representation_html_a473e45dbbf64e6ab6ed670ccedac84ed"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation::SuppressOnce</a></div><div class="ttdeci">void SuppressOnce(SuppressFlag flag)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l01203">mpd_builder.cc:1203</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d12/mpd__writer_8cc_source.html b/docs/dd/d12/mpd__writer_8cc_source.html
index 86b63d81eb..dd70d630f4 100644
--- a/docs/dd/d12/mpd__writer_8cc_source.html
+++ b/docs/dd/d12/mpd__writer_8cc_source.html
@@ -216,12 +216,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;}</div>
 <div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
 <div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00646">mpd_builder.cc:646</a></div></div>
+<div class="ttc" id="classshaka_1_1MpdBuilder_html_a247a9c807274d4e707530f24e2d207f9"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">shaka::MpdBuilder::MakePathsRelativeToMpd</a></div><div class="ttdeci">static void MakePathsRelativeToMpd(const std::string &amp;mpd_path, MediaInfo *media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d11/mpd__builder_8cc_source.html#l00643">mpd_builder.cc:643</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_a622dbc8abacebb40b816aa0174ba7c60"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">shaka::media::File::ReadFileToString</a></div><div class="ttdeci">static bool ReadFileToString(const char *file_name, std::string *contents)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00185">file.cc:185</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html b/docs/dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html
index e0ca25b69b..210b24b3d2 100644
--- a/docs/dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html
+++ b/docs/dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html
@@ -188,7 +188,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html b/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html
index b4c3f08517..c102c88ac5 100644
--- a/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html
+++ b/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html
@@ -113,8 +113,9 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:a0f9b7c954ff48c3021467300d755ac29"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a117ba5528a92b0cf4752d15d3692e158"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">Cancel</a> ()</td></tr>
 <tr class="separator:a117ba5528a92b0cf4752d15d3692e158"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:af89c3d15b452d45bcacea9470ba43a7f"><td class="memItemLeft" align="right" valign="top">const std::vector&lt; <a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a> * &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a> ()</td></tr>
-<tr class="separator:af89c3d15b452d45bcacea9470ba43a7f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aafb74f83b0de2c787336bad9f096ce50"><td class="memItemLeft" align="right" valign="top">const std::vector<br class="typebreak"/>
+&lt; std::unique_ptr&lt; <a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a> &gt; &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a> ()</td></tr>
+<tr class="separator:aafb74f83b0de2c787336bad9f096ce50"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a385c93fd8d589b7d3bccd35e14c58290"><td class="memItemLeft" align="right" valign="top">MediaContainerName&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">container_name</a> ()</td></tr>
 <tr class="separator:a385c93fd8d589b7d3bccd35e14c58290"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
@@ -151,7 +152,7 @@ Public Member Functions</h2></td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00037">37</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00036">36</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
 
 </div>
 </div>
@@ -170,7 +171,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Cancel a demuxing job in progress. Will cause <em>Run</em> to exit with an error status of type CANCELLED. </p>
 
-<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00232">232</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00222">222</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
 
 </div>
 </div>
@@ -196,7 +197,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>Container name (type). Value is CONTAINER_UNKNOWN if the demuxer is not initialized. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../de/dc1/demuxer_8h_source.html#l00072">72</a> of file <a class="el" href="../../de/dc1/demuxer_8h_source.html">demuxer.h</a>.</p>
+<p>Definition at line <a class="el" href="../../de/dc1/demuxer_8h_source.html#l00074">74</a> of file <a class="el" href="../../de/dc1/demuxer_8h_source.html">demuxer.h</a>.</p>
 
 </div>
 </div>
@@ -215,7 +216,7 @@ Public Member Functions</h2></td></tr>
 <p>Initialize the <a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">Demuxer</a>. Calling other public methods of this class without this method returning OK, results in an undefined behavior. This method primes the demuxer by parsing portions of the media file to extract stream information. </p>
 <dl class="section return"><dt>Returns</dt><dd>OK on success. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00056">56</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00054">54</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
 
 </div>
 </div>
@@ -233,7 +234,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Drive the remuxing from demuxer side (push). Read the file and push the Data to <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">Muxer</a> until Eof. </p>
 
-<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00173">173</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00167">167</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
 
 </div>
 </div>
@@ -258,11 +259,11 @@ Public Member Functions</h2></td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00052">52</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d3/dbe/demuxer_8cc_source.html#l00050">50</a> of file <a class="el" href="../../d3/dbe/demuxer_8cc_source.html">demuxer.cc</a>.</p>
 
 </div>
 </div>
-<a class="anchor" id="af89c3d15b452d45bcacea9470ba43a7f"></a>
+<a class="anchor" id="aafb74f83b0de2c787336bad9f096ce50"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -270,7 +271,7 @@ Public Member Functions</h2></td></tr>
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">const std::vector&lt;<a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>*&gt;&amp; shaka::media::Demuxer::streams </td>
+          <td class="memname">const std::vector&lt;std::unique_ptr&lt;<a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>&gt; &gt;&amp; shaka::media::Demuxer::streams </td>
           <td>(</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
@@ -295,7 +296,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d18/es__parser__adts_8h_source.html b/docs/dd/d18/es__parser__adts_8h_source.html
index 9c44c695cb..3128e40be9 100644
--- a/docs/dd/d18/es__parser__adts_8h_source.html
+++ b/docs/dd/d18/es__parser__adts_8h_source.html
@@ -172,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d19/video__stream__info_8cc_source.html b/docs/dd/d19/video__stream__info_8cc_source.html
index 97a9549971..9f393bf59e 100644
--- a/docs/dd/d19/video__stream__info_8cc_source.html
+++ b/docs/dd/d19/video__stream__info_8cc_source.html
@@ -96,91 +96,90 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/video_stream_info.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;</div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_number_conversions.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_util.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/stringprintf.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/limits.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;std::string VideoCodecToString(Codec codec) {</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  <span class="keywordflow">switch</span> (codec) {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    <span class="keywordflow">case</span> kCodecH264:</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;H264&quot;</span>;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    <span class="keywordflow">case</span> kCodecHEV1:</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;HEV1&quot;</span>;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="keywordflow">case</span> kCodecHVC1:</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;HVC1&quot;</span>;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    <span class="keywordflow">case</span> kCodecVC1:</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VC1&quot;</span>;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    <span class="keywordflow">case</span> kCodecMPEG2:</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;MPEG2&quot;</span>;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keywordflow">case</span> kCodecMPEG4:</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;MPEG4&quot;</span>;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keywordflow">case</span> kCodecTheora:</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;Theora&quot;</span>;</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    <span class="keywordflow">case</span> kCodecVP8:</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP8&quot;</span>;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    <span class="keywordflow">case</span> kCodecVP9:</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP9&quot;</span>;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    <span class="keywordflow">case</span> kCodecVP10:</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP10&quot;</span>;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;Unknown Video Codec: &quot;</span> &lt;&lt; codec;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;UnknownCodec&quot;</span>;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  }</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;}</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">   50</a></span>&#160;<a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">VideoStreamInfo::VideoStreamInfo</a>(</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keywordtype">int</span> track_id, uint32_t time_scale, uint64_t duration, Codec codec,</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">const</span> std::string&amp; codec_string, <span class="keyword">const</span> uint8_t* codec_config,</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    <span class="keywordtype">size_t</span> codec_config_size, uint16_t width, uint16_t height,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    uint8_t nalu_length_size, <span class="keyword">const</span> std::string&amp; language, <span class="keywordtype">bool</span> is_encrypted)</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    : <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>(kStreamVideo, track_id, time_scale, duration, codec,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                 codec_string, codec_config, codec_config_size, language,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;                 is_encrypted),</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;      width_(width),</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      height_(height),</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      pixel_width_(pixel_width),</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;      pixel_height_(pixel_height),</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;      trick_play_rate_(trick_play_rate),</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;      nalu_length_size_(nalu_length_size) {}</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;VideoStreamInfo::~VideoStreamInfo() {}</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">   68</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">VideoStreamInfo::IsValidConfig</a>()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordflow">return</span> codec() != kUnknownCodec &amp;&amp; width_ &gt; 0 &amp;&amp;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;         width_ &lt;= limits::kMaxDimension &amp;&amp; height_ &gt; 0 &amp;&amp;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;         height_ &lt;= limits::kMaxDimension &amp;&amp;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;         (nalu_length_size_ &lt;= 2 || nalu_length_size_ == 4);</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;}</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
-<div class="line"><a name="l00075"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">   75</a></span>&#160;std::string <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">VideoStreamInfo::ToString</a>()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordflow">return</span> base::StringPrintf(</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;      <span class="stringliteral">&quot;%s codec: %s\n width: %d\n height: %d\n pixel_aspect_ratio: %d:%d\n &quot;</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;      <span class="stringliteral">&quot;trick_play_rate: %d\n nalu_length_size: %d\n&quot;</span>,</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;      <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html#aa11d2fe5509ebfdc038aa3f2cdbbe00d">StreamInfo::ToString</a>().c_str(), VideoCodecToString(codec()).c_str(),</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;      width_, height_, pixel_width_, pixel_height_, trick_play_rate_,</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      nalu_length_size_);</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;}</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_number_conversions.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_util.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/stringprintf.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/limits.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;std::string VideoCodecToString(Codec codec) {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  <span class="keywordflow">switch</span> (codec) {</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;    <span class="keywordflow">case</span> kCodecH264:</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;H264&quot;</span>;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keywordflow">case</span> kCodecHEV1:</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;HEV1&quot;</span>;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <span class="keywordflow">case</span> kCodecHVC1:</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;HVC1&quot;</span>;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    <span class="keywordflow">case</span> kCodecVC1:</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VC1&quot;</span>;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    <span class="keywordflow">case</span> kCodecMPEG2:</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;MPEG2&quot;</span>;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    <span class="keywordflow">case</span> kCodecMPEG4:</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;MPEG4&quot;</span>;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    <span class="keywordflow">case</span> kCodecTheora:</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;Theora&quot;</span>;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keywordflow">case</span> kCodecVP8:</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP8&quot;</span>;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    <span class="keywordflow">case</span> kCodecVP9:</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP9&quot;</span>;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keywordflow">case</span> kCodecVP10:</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;VP10&quot;</span>;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;Unknown Video Codec: &quot;</span> &lt;&lt; codec;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      <span class="keywordflow">return</span> <span class="stringliteral">&quot;UnknownCodec&quot;</span>;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  }</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;}</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">   49</a></span>&#160;<a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">VideoStreamInfo::VideoStreamInfo</a>(</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordtype">int</span> track_id, uint32_t time_scale, uint64_t duration, Codec codec,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keyword">const</span> std::string&amp; codec_string, <span class="keyword">const</span> uint8_t* codec_config,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordtype">size_t</span> codec_config_size, uint16_t width, uint16_t height,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    uint8_t nalu_length_size, <span class="keyword">const</span> std::string&amp; language, <span class="keywordtype">bool</span> is_encrypted)</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    : <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>(kStreamVideo, track_id, time_scale, duration, codec,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                 codec_string, codec_config, codec_config_size, language,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                 is_encrypted),</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;      width_(width),</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;      height_(height),</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      pixel_width_(pixel_width),</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      pixel_height_(pixel_height),</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;      trick_play_rate_(trick_play_rate),</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;      nalu_length_size_(nalu_length_size) {}</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;VideoStreamInfo::~VideoStreamInfo() {}</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">   67</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">VideoStreamInfo::IsValidConfig</a>()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordflow">return</span> codec() != kUnknownCodec &amp;&amp; width_ &gt; 0 &amp;&amp;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;         width_ &lt;= limits::kMaxDimension &amp;&amp; height_ &gt; 0 &amp;&amp;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;         height_ &lt;= limits::kMaxDimension &amp;&amp;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;         (nalu_length_size_ &lt;= 2 || nalu_length_size_ == 4);</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;}</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno"><a class="line" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">   74</a></span>&#160;std::string <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">VideoStreamInfo::ToString</a>()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">return</span> base::StringPrintf(</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;      <span class="stringliteral">&quot;%s codec: %s\n width: %d\n height: %d\n pixel_aspect_ratio: %d:%d\n &quot;</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;      <span class="stringliteral">&quot;trick_play_rate: %d\n nalu_length_size: %d\n&quot;</span>,</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;      <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html#aa11d2fe5509ebfdc038aa3f2cdbbe00d">StreamInfo::ToString</a>().c_str(), VideoCodecToString(codec()).c_str(),</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;      width_, height_, pixel_width_, pixel_height_, trick_play_rate_,</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;      nalu_length_size_);</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;}</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">shaka::media::StreamInfo</a></div><div class="ttdoc">Abstract class holds stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/daa/stream__info_8h_source.html#l00053">stream_info.h:53</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a8978ca2bc2dd63c2e25e77cdcf676162"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">shaka::media::VideoStreamInfo::IsValidConfig</a></div><div class="ttdeci">bool IsValidConfig() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00068">video_stream_info.cc:68</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a8978ca2bc2dd63c2e25e77cdcf676162"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a8978ca2bc2dd63c2e25e77cdcf676162">shaka::media::VideoStreamInfo::IsValidConfig</a></div><div class="ttdeci">bool IsValidConfig() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00067">video_stream_info.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html_aa11d2fe5509ebfdc038aa3f2cdbbe00d"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html#aa11d2fe5509ebfdc038aa3f2cdbbe00d">shaka::media::StreamInfo::ToString</a></div><div class="ttdeci">virtual std::string ToString() const </div><div class="ttdef"><b>Definition:</b> <a href="../../de/dfd/stream__info_8cc_source.html#l00037">stream_info.cc:37</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a9cac8e75d76f1192a48d1dcf61435537"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">shaka::media::VideoStreamInfo::ToString</a></div><div class="ttdeci">std::string ToString() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00075">video_stream_info.cc:75</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a3de6a7d65ddd877c513f3047a86db59e"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">shaka::media::VideoStreamInfo::VideoStreamInfo</a></div><div class="ttdeci">VideoStreamInfo(int track_id, uint32_t time_scale, uint64_t duration, Codec codec, const std::string &amp;codec_string, const uint8_t *codec_config, size_t codec_config_size, uint16_t width, uint16_t height, uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate, uint8_t nalu_length_size, const std::string &amp;language, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00050">video_stream_info.cc:50</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a9cac8e75d76f1192a48d1dcf61435537"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a9cac8e75d76f1192a48d1dcf61435537">shaka::media::VideoStreamInfo::ToString</a></div><div class="ttdeci">std::string ToString() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00074">video_stream_info.cc:74</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1VideoStreamInfo_html_a3de6a7d65ddd877c513f3047a86db59e"><div class="ttname"><a href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html#a3de6a7d65ddd877c513f3047a86db59e">shaka::media::VideoStreamInfo::VideoStreamInfo</a></div><div class="ttdeci">VideoStreamInfo(int track_id, uint32_t time_scale, uint64_t duration, Codec codec, const std::string &amp;codec_string, const uint8_t *codec_config, size_t codec_config_size, uint16_t width, uint16_t height, uint32_t pixel_width, uint32_t pixel_height, int16_t trick_play_rate, uint8_t nalu_length_size, const std::string &amp;language, bool is_encrypted)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d19/video__stream__info_8cc_source.html#l00049">video_stream_info.cc:49</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d30/wvm__media__parser_8cc_source.html b/docs/dd/d30/wvm__media__parser_8cc_source.html
index 735f26aab6..8c943ce2a9 100644
--- a/docs/dd/d30/wvm__media__parser_8cc_source.html
+++ b/docs/dd/d30/wvm__media__parser_8cc_source.html
@@ -1265,7 +1265,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d3b/mp4_2segmenter_8h_source.html b/docs/dd/d3b/mp4_2segmenter_8h_source.html
index 8a26b6ccc2..15dcd81994 100644
--- a/docs/dd/d3b/mp4_2segmenter_8h_source.html
+++ b/docs/dd/d3b/mp4_2segmenter_8h_source.html
@@ -184,7 +184,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  std::unique_ptr&lt;MovieFragment&gt; moof_;</div>
 <div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  std::unique_ptr&lt;BufferWriter&gt; fragment_buffer_;</div>
 <div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  std::unique_ptr&lt;SegmentIndex&gt; sidx_;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  std::vector&lt;Fragmenter*&gt; fragmenters_;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  std::vector&lt;std::unique_ptr&lt;Fragmenter&gt;&gt; fragmenters_;</div>
 <div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  std::vector&lt;uint64_t&gt; segment_durations_;</div>
 <div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  std::map&lt;const MediaStream*, uint32_t&gt; stream_map_;</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  MuxerListener* muxer_listener_;</div>
@@ -201,26 +201,26 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
 <div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_MP4_SEGMENTER_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a0440c751fd818964397d17330acc7afc"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">shaka::media::mp4::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const std::vector&lt; MediaStream * &gt; &amp;streams, MuxerListener *muxer_listener, ProgressListener *progress_listener, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00166">segmenter.cc:166</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00389">segmenter.cc:389</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_adea4bf88a29660bd8612ae3bc5048068"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">shaka::media::mp4::Segmenter::SetComplete</a></div><div class="ttdeci">void SetComplete()</div><div class="ttdoc">Set progress to 100%. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00405">segmenter.cc:405</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a0440c751fd818964397d17330acc7afc"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">shaka::media::mp4::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const std::vector&lt; MediaStream * &gt; &amp;streams, MuxerListener *muxer_listener, ProgressListener *progress_listener, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00165">segmenter.cc:165</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_afd8bb3584c984c711615800ad93642a3"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">shaka::media::mp4::Segmenter::UpdateProgress</a></div><div class="ttdeci">void UpdateProgress(uint64_t progress)</div><div class="ttdoc">Update segmentation progress using ProgressListener. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00387">segmenter.cc:387</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_adea4bf88a29660bd8612ae3bc5048068"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">shaka::media::mp4::Segmenter::SetComplete</a></div><div class="ttdeci">void SetComplete()</div><div class="ttdoc">Set progress to 100%. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00403">segmenter.cc:403</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a3a1c6721aa53a124af8be50bb3f7599c"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a3a1c6721aa53a124af8be50bb3f7599c">shaka::media::mp4::Segmenter::GetInitRange</a></div><div class="ttdeci">virtual bool GetInitRange(size_t *offset, size_t *size)=0</div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">shaka::media::MuxerOptions</a></div><div class="ttdoc">This structure contains the list of configuration options for Muxer. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00018">muxer_options.h:18</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_aeed8f5be9d9d7266afd017e0e5692d8d"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#aeed8f5be9d9d7266afd017e0e5692d8d">shaka::media::mp4::Segmenter::sample_duration</a></div><div class="ttdeci">uint32_t sample_duration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d3b/mp4_2segmenter_8h_source.html#l00101">segmenter.h:101</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a4a1a9e50050e75584ff1087aa318096a"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">shaka::media::mp4::Segmenter::AddSample</a></div><div class="ttdeci">Status AddSample(const MediaStream *stream, scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00322">segmenter.cc:322</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a4a1a9e50050e75584ff1087aa318096a"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a4a1a9e50050e75584ff1087aa318096a">shaka::media::mp4::Segmenter::AddSample</a></div><div class="ttdeci">Status AddSample(const MediaStream *stream, scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00320">segmenter.cc:320</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProgressListener_html"><div class="ttname"><a href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">shaka::media::ProgressListener</a></div><div class="ttdoc">This class listens to progress updates events. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d9d/progress__listener_8h_source.html#l00020">progress_listener.h:20</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d3b/mp4_2segmenter_8h_source.html#l00041">segmenter.h:41</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a464a30159b8888a54254356d191947ac"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">shaka::media::mp4::Segmenter::Finalize</a></div><div class="ttdeci">Status Finalize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00296">segmenter.cc:296</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></div><div class="ttdoc">KeySource is responsible for encryption key acquisition. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3f/key__source_8h_source.html#l00030">key_source.h:30</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a7283c64cb63a94264ff8fe405b8ce5c2"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter::GetDuration</a></div><div class="ttdeci">double GetDuration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00380">segmenter.cc:380</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a7283c64cb63a94264ff8fe405b8ce5c2"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter::GetDuration</a></div><div class="ttdeci">double GetDuration() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da8/mp4_2segmenter_8cc_source.html#l00378">segmenter.cc:378</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Segmenter_html_a7ab68d898343b322dc32c08ad42e859c"><div class="ttname"><a href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7ab68d898343b322dc32c08ad42e859c">shaka::media::mp4::Segmenter::GetIndexRange</a></div><div class="ttdeci">virtual bool GetIndexRange(size_t *offset, size_t *size)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">shaka::media::MediaStream</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d93/media__stream_8h_source.html#l00026">media_stream.h:26</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">shaka::media::MuxerListener</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dfa/muxer__listener_8h_source.html#l00030">muxer_listener.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d3f/structshaka_1_1media_1_1mp4_1_1SyncSample.html b/docs/dd/d3f/structshaka_1_1media_1_1mp4_1_1SyncSample.html
index 23935282d0..dfb9a198c4 100644
--- a/docs/dd/d3f/structshaka_1_1media_1_1mp4_1_1SyncSample.html
+++ b/docs/dd/d3f/structshaka_1_1media_1_1mp4_1_1SyncSample.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d42/encryptor_8h_source.html b/docs/dd/d42/encryptor_8h_source.html
index dc2fe5e544..4d4c285d9a 100644
--- a/docs/dd/d42/encryptor_8h_source.html
+++ b/docs/dd/d42/encryptor_8h_source.html
@@ -161,7 +161,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d46/webm__parser_8h_source.html b/docs/dd/d46/webm__parser_8h_source.html
index 52dd8a0da9..fdfbc7fd78 100644
--- a/docs/dd/d46/webm__parser_8h_source.html
+++ b/docs/dd/d46/webm__parser_8h_source.html
@@ -227,7 +227,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d4d/structshaka_1_1media_1_1mp4_1_1MovieFragment-members.html b/docs/dd/d4d/structshaka_1_1media_1_1mp4_1_1MovieFragment-members.html
index db0ca2548c..5b78c9bacb 100644
--- a/docs/dd/d4d/structshaka_1_1media_1_1mp4_1_1MovieFragment-members.html
+++ b/docs/dd/d4d/structshaka_1_1media_1_1mp4_1_1MovieFragment-members.html
@@ -111,7 +111,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d53/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample-members.html b/docs/dd/d53/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample-members.html
index 873c12fb2b..989bc8a8a4 100644
--- a/docs/dd/d53/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample-members.html
+++ b/docs/dd/d53/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d54/widevine__encryption__flags_8h_source.html b/docs/dd/d54/widevine__encryption__flags_8h_source.html
index f694323394..c7cb242b55 100644
--- a/docs/dd/d54/widevine__encryption__flags_8h_source.html
+++ b/docs/dd/d54/widevine__encryption__flags_8h_source.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d59/classshaka_1_1media_1_1mp2t_1_1EsParserH265-members.html b/docs/dd/d59/classshaka_1_1media_1_1mp2t_1_1EsParserH265-members.html
index 85195823f2..17b5ddbbcd 100644
--- a/docs/dd/d59/classshaka_1_1media_1_1mp2t_1_1EsParserH265-members.html
+++ b/docs/dd/d59/classshaka_1_1media_1_1mp2t_1_1EsParserH265-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d59/structshaka_1_1media_1_1mp4_1_1SchemeInfo-members.html b/docs/dd/d59/structshaka_1_1media_1_1mp4_1_1SchemeInfo-members.html
index 131f88fb0a..5997b157c7 100644
--- a/docs/dd/d59/structshaka_1_1media_1_1mp4_1_1SchemeInfo-members.html
+++ b/docs/dd/d59/structshaka_1_1media_1_1mp4_1_1SchemeInfo-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d64/structshaka_1_1media_1_1mp4_1_1SyncSample-members.html b/docs/dd/d64/structshaka_1_1media_1_1mp4_1_1SyncSample-members.html
index 377be8c5dd..178eb8a04d 100644
--- a/docs/dd/d64/structshaka_1_1media_1_1mp4_1_1SyncSample-members.html
+++ b/docs/dd/d64/structshaka_1_1media_1_1mp4_1_1SyncSample-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d65/vp8__parser_8h_source.html b/docs/dd/d65/vp8__parser_8h_source.html
index 3cc9da9861..f8fc479fae 100644
--- a/docs/dd/d65/vp8__parser_8h_source.html
+++ b/docs/dd/d65/vp8__parser_8h_source.html
@@ -136,7 +136,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d67/h264__byte__to__unit__stream__converter_8cc_source.html b/docs/dd/d67/h264__byte__to__unit__stream__converter_8cc_source.html
index 91e04f426e..4ad49ef72e 100644
--- a/docs/dd/d67/h264__byte__to__unit__stream__converter_8cc_source.html
+++ b/docs/dd/d67/h264__byte__to__unit__stream__converter_8cc_source.html
@@ -177,7 +177,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d6e/classshaka_1_1media_1_1H265VideoSliceHeaderParser-members.html b/docs/dd/d6e/classshaka_1_1media_1_1H265VideoSliceHeaderParser-members.html
index 5b0941562d..8b94f1ea9c 100644
--- a/docs/dd/d6e/classshaka_1_1media_1_1H265VideoSliceHeaderParser-members.html
+++ b/docs/dd/d6e/classshaka_1_1media_1_1H265VideoSliceHeaderParser-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d71/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio.html b/docs/dd/d71/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio.html
index 67a2450647..b1685c04fe 100644
--- a/docs/dd/d71/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio.html
+++ b/docs/dd/d71/structshaka_1_1media_1_1mp4_1_1PixelAspectRatio.html
@@ -176,7 +176,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d7a/classshaka_1_1media_1_1MuxerListener.html b/docs/dd/d7a/classshaka_1_1media_1_1MuxerListener.html
index 30d33ff8b7..8a7cc6f411 100644
--- a/docs/dd/d7a/classshaka_1_1media_1_1MuxerListener.html
+++ b/docs/dd/d7a/classshaka_1_1media_1_1MuxerListener.html
@@ -469,7 +469,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d7c/classshaka_1_1media_1_1IoCache.html b/docs/dd/d7c/classshaka_1_1media_1_1IoCache.html
index 600ec0d587..fbc0556498 100644
--- a/docs/dd/d7c/classshaka_1_1media_1_1IoCache.html
+++ b/docs/dd/d7c/classshaka_1_1media_1_1IoCache.html
@@ -297,7 +297,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d80/media__sample_8h_source.html b/docs/dd/d80/media__sample_8h_source.html
index 92a8407e8a..5056a1b108 100644
--- a/docs/dd/d80/media__sample_8h_source.html
+++ b/docs/dd/d80/media__sample_8h_source.html
@@ -259,7 +259,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d87/memory__file_8cc_source.html b/docs/dd/d87/memory__file_8cc_source.html
index 111f670a90..6693cfafca 100644
--- a/docs/dd/d87/memory__file_8cc_source.html
+++ b/docs/dd/d87/memory__file_8cc_source.html
@@ -242,7 +242,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d88/pes__packet__generator_8h_source.html b/docs/dd/d88/pes__packet__generator_8h_source.html
index d266ebbb66..94c0fb8ef6 100644
--- a/docs/dd/d88/pes__packet__generator_8h_source.html
+++ b/docs/dd/d88/pes__packet__generator_8h_source.html
@@ -99,71 +99,69 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;list&gt;</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">class </span>AACAudioSpecificConfig;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">class </span>NalUnitToByteStreamConverter;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">class </span>StreamInfo;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">class </span>PesPacket;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
-<div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">   32</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a> {</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>();</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>();</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">Initialize</a>(<span class="keyword">const</span> <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>&amp; stream);</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">PushSample</a>(scoped_refptr&lt;MediaSample&gt; sample);</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">SetEncryptionKey</a>(std::unique_ptr&lt;EncryptionKey&gt; encryption_key);</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">size_t</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">NumberOfReadyPesPackets</a>();</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keyword">virtual</span> std::unique_ptr&lt;PesPacket&gt; <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">GetNextPesPacket</a>();</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">Flush</a>();</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>PesPacketGeneratorTest;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  StreamType stream_type_;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// Calculated by 90000 / input stream&#39;s timescale. This is used to scale the</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// timestamps.</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">double</span> timescale_scale_ = 0.0;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  std::unique_ptr&lt;NalUnitToByteStreamConverter&gt; converter_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  std::unique_ptr&lt;AACAudioSpecificConfig&gt; adts_converter_;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="comment">// This is the PES packet that this object is currently working on.</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="comment">// This can be used to create a PES from multiple audio samples.</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  std::unique_ptr&lt;PesPacket&gt; current_processing_pes_;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  std::list&lt;PesPacket*&gt; pes_packets_;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  STLElementDeleter&lt;decltype(pes_packets_)&gt; pes_packets_deleter_;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="comment">// Current encryption key.</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  std::unique_ptr&lt;AesCryptor&gt; encryptor_;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>);</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;};</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;<span class="preprocessor">#endif  // PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_GENERATOR_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d88/pes__packet__generator_8h_source.html#l00032">pes_packet_generator.h:32</a></div></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/key_source.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_sample.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/stream_info.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">class </span>AACAudioSpecificConfig;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">class </span>NalUnitToByteStreamConverter;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">class </span>StreamInfo;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>mp2t {</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">class </span>PesPacket;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
+<div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a> {</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>();</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>();</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">Initialize</a>(<span class="keyword">const</span> <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>&amp; stream);</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">PushSample</a>(scoped_refptr&lt;MediaSample&gt; sample);</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">SetEncryptionKey</a>(std::unique_ptr&lt;EncryptionKey&gt; encryption_key);</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">size_t</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">NumberOfReadyPesPackets</a>();</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keyword">virtual</span> std::unique_ptr&lt;PesPacket&gt; <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">GetNextPesPacket</a>();</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">Flush</a>();</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>PesPacketGeneratorTest;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  StreamType stream_type_;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// Calculated by 90000 / input stream&#39;s timescale. This is used to scale the</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// timestamps.</span></div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordtype">double</span> timescale_scale_ = 0.0;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  std::unique_ptr&lt;NalUnitToByteStreamConverter&gt; converter_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  std::unique_ptr&lt;AACAudioSpecificConfig&gt; adts_converter_;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="comment">// This is the PES packet that this object is currently working on.</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="comment">// This can be used to create a PES from multiple audio samples.</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  std::unique_ptr&lt;PesPacket&gt; current_processing_pes_;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  std::list&lt;std::unique_ptr&lt;PesPacket&gt;&gt; pes_packets_;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="comment">// Current encryption key.</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  std::unique_ptr&lt;AesCryptor&gt; encryptor_;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a>);</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;};</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;<span class="preprocessor">#endif  // PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_GENERATOR_H_</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d88/pes__packet__generator_8h_source.html#l00031">pes_packet_generator.h:31</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1StreamInfo_html"><div class="ttname"><a href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">shaka::media::StreamInfo</a></div><div class="ttdoc">Abstract class holds stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/daa/stream__info_8h_source.html#l00053">stream_info.h:53</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_acf11010f62ab9d2b46308f2cce8b3650"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">shaka::media::mp2t::PesPacketGenerator::GetNextPesPacket</a></div><div class="ttdeci">virtual std::unique_ptr&lt; PesPacket &gt; GetNextPesPacket()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00210">pes_packet_generator.cc:210</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a71ea0819224b94ba9df5c951424bc6b1"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">shaka::media::mp2t::PesPacketGenerator::Flush</a></div><div class="ttdeci">virtual bool Flush()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00217">pes_packet_generator.cc:217</a></div></div>
@@ -174,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d8c/file__test__util_8h_source.html b/docs/dd/d8c/file__test__util_8h_source.html
index 99ddde940b..5094880cc8 100644
--- a/docs/dd/d8c/file__test__util_8h_source.html
+++ b/docs/dd/d8c/file__test__util_8h_source.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d8d/structshaka_1_1media_1_1mp4_1_1SegmentIndex-members.html b/docs/dd/d8d/structshaka_1_1media_1_1mp4_1_1SegmentIndex-members.html
index fd3b3ca5e7..23ecd3f5d6 100644
--- a/docs/dd/d8d/structshaka_1_1media_1_1mp4_1_1SegmentIndex-members.html
+++ b/docs/dd/d8d/structshaka_1_1media_1_1mp4_1_1SegmentIndex-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d98/ts__packet__writer__util_8h_source.html b/docs/dd/d98/ts__packet__writer__util_8h_source.html
index 5013cb2262..cafa0face1 100644
--- a/docs/dd/d98/ts__packet__writer__util_8h_source.html
+++ b/docs/dd/d98/ts__packet__writer__util_8h_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d9a/audio__timestamp__helper_8h_source.html b/docs/dd/d9a/audio__timestamp__helper_8h_source.html
index 073d480086..b2d9dfb213 100644
--- a/docs/dd/d9a/audio__timestamp__helper_8h_source.html
+++ b/docs/dd/d9a/audio__timestamp__helper_8h_source.html
@@ -167,7 +167,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d9b/structshaka_1_1media_1_1mp4_1_1SegmentReference.html b/docs/dd/d9b/structshaka_1_1media_1_1mp4_1_1SegmentReference.html
index 4b75c0105f..23f58b381a 100644
--- a/docs/dd/d9b/structshaka_1_1media_1_1mp4_1_1SegmentReference.html
+++ b/docs/dd/d9b/structshaka_1_1media_1_1mp4_1_1SegmentReference.html
@@ -143,7 +143,7 @@ uint64_t&#160;</td><td class="memItemRight" valign="bottom"><b>earliest_presenta
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/d9d/classshaka_1_1MpdNotifier-members.html b/docs/dd/d9d/classshaka_1_1MpdNotifier-members.html
index 3b4376267e..47a460766f 100644
--- a/docs/dd/d9d/classshaka_1_1MpdNotifier-members.html
+++ b/docs/dd/d9d/classshaka_1_1MpdNotifier-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/da4/structshaka_1_1xml_1_1XmlDeleter.html b/docs/dd/da4/structshaka_1_1xml_1_1XmlDeleter.html
index c1af190e2f..63aaa4e0f2 100644
--- a/docs/dd/da4/structshaka_1_1xml_1_1XmlDeleter.html
+++ b/docs/dd/da4/structshaka_1_1xml_1_1XmlDeleter.html
@@ -127,7 +127,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>operator()</b> (xmlCh
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html b/docs/dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html
index 3f4435874a..69f635e74b 100644
--- a/docs/dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html
+++ b/docs/dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html
@@ -217,7 +217,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/daa/vod__media__info__dump__muxer__listener_8h_source.html b/docs/dd/daa/vod__media__info__dump__muxer__listener_8h_source.html
index e2fc840497..0904a73dda 100644
--- a/docs/dd/daa/vod__media__info__dump__muxer__listener_8h_source.html
+++ b/docs/dd/daa/vod__media__info__dump__muxer__listener_8h_source.html
@@ -180,7 +180,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dab/webm__muxer_8h_source.html b/docs/dd/dab/webm__muxer_8h_source.html
index c403febfae..30380608a4 100644
--- a/docs/dd/dab/webm__muxer_8h_source.html
+++ b/docs/dd/dab/webm__muxer_8h_source.html
@@ -138,7 +138,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dae/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox-members.html b/docs/dd/dae/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox-members.html
index 7d0a5be1a9..78d20ab8c0 100644
--- a/docs/dd/dae/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox-members.html
+++ b/docs/dd/dae/structshaka_1_1media_1_1mp4_1_1WebVTTSourceLabelBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/db0/classshaka_1_1media_1_1WebMAudioClient-members.html b/docs/dd/db0/classshaka_1_1media_1_1WebMAudioClient-members.html
index af1104a30e..34ce31c753 100644
--- a/docs/dd/db0/classshaka_1_1media_1_1WebMAudioClient-members.html
+++ b/docs/dd/db0/classshaka_1_1media_1_1WebMAudioClient-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/db3/structshaka_1_1media_1_1mp4_1_1SampleTable-members.html b/docs/dd/db3/structshaka_1_1media_1_1mp4_1_1SampleTable-members.html
index 99fb3c6a0f..7f9b29b49b 100644
--- a/docs/dd/db3/structshaka_1_1media_1_1mp4_1_1SampleTable-members.html
+++ b/docs/dd/db3/structshaka_1_1media_1_1mp4_1_1SampleTable-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html b/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html
index 7fb5d0903f..6284f216d6 100644
--- a/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html
+++ b/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html
@@ -156,7 +156,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dbc/buffer__reader_8cc_source.html b/docs/dd/dbc/buffer__reader_8cc_source.html
index adedcaa66d..9fbbc3fce9 100644
--- a/docs/dd/dbc/buffer__reader_8cc_source.html
+++ b/docs/dd/dbc/buffer__reader_8cc_source.html
@@ -196,7 +196,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html b/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html
index 5bb730a0dc..11a7675bbe 100644
--- a/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html
+++ b/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html
@@ -120,7 +120,7 @@ std::vector&lt; uint8_t &gt;&#160;</td><td class="memItemRight" valign="bottom">
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dbd/structshaka_1_1media_1_1mp4_1_1TrackEncryption-members.html b/docs/dd/dbd/structshaka_1_1media_1_1mp4_1_1TrackEncryption-members.html
index cab2935e0f..6a78bb3664 100644
--- a/docs/dd/dbd/structshaka_1_1media_1_1mp4_1_1TrackEncryption-members.html
+++ b/docs/dd/dbd/structshaka_1_1media_1_1mp4_1_1TrackEncryption-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dbf/webm__webvtt__parser_8h_source.html b/docs/dd/dbf/webm__webvtt__parser_8h_source.html
index 17b2337700..aa602f8f24 100644
--- a/docs/dd/dbf/webm__webvtt__parser_8h_source.html
+++ b/docs/dd/dbf/webm__webvtt__parser_8h_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dc1/structshaka_1_1media_1_1mp4_1_1FullBox.html b/docs/dd/dc1/structshaka_1_1media_1_1mp4_1_1FullBox.html
index e1acc7bc1b..0cd46e23e0 100644
--- a/docs/dd/dc1/structshaka_1_1media_1_1mp4_1_1FullBox.html
+++ b/docs/dd/dc1/structshaka_1_1media_1_1mp4_1_1FullBox.html
@@ -245,7 +245,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dc4/classshaka_1_1media_1_1ProducerConsumerQueue-members.html b/docs/dd/dc4/classshaka_1_1media_1_1ProducerConsumerQueue-members.html
index 973f169a49..93c2454bbf 100644
--- a/docs/dd/dc4/classshaka_1_1media_1_1ProducerConsumerQueue-members.html
+++ b/docs/dd/dc4/classshaka_1_1media_1_1ProducerConsumerQueue-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html b/docs/dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html
index 619608e5dc..a75142dd53 100644
--- a/docs/dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html
+++ b/docs/dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html
@@ -427,7 +427,7 @@ virtual <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Sta
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dca/structshaka_1_1media_1_1mp4_1_1OriginalFormat-members.html b/docs/dd/dca/structshaka_1_1media_1_1mp4_1_1OriginalFormat-members.html
index f19eba235d..0ac2617950 100644
--- a/docs/dd/dca/structshaka_1_1media_1_1mp4_1_1OriginalFormat-members.html
+++ b/docs/dd/dca/structshaka_1_1media_1_1mp4_1_1OriginalFormat-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dce/structshaka_1_1media_1_1Cue.html b/docs/dd/dce/structshaka_1_1media_1_1Cue.html
index 86d326338d..66be616f16 100644
--- a/docs/dd/dce/structshaka_1_1media_1_1Cue.html
+++ b/docs/dd/dce/structshaka_1_1media_1_1Cue.html
@@ -125,7 +125,7 @@ std::vector&lt; std::string &gt;&#160;</td><td class="memItemRight" valign="bott
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dd2/buffer__writer_8h_source.html b/docs/dd/dd2/buffer__writer_8h_source.html
index ff883b3762..b4ff24b757 100644
--- a/docs/dd/dd2/buffer__writer_8h_source.html
+++ b/docs/dd/dd2/buffer__writer_8h_source.html
@@ -159,7 +159,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dd3/buffer__writer_8cc_source.html b/docs/dd/dd3/buffer__writer_8cc_source.html
index ead39fe7ef..15a179366c 100644
--- a/docs/dd/dd3/buffer__writer_8cc_source.html
+++ b/docs/dd/dd3/buffer__writer_8cc_source.html
@@ -187,7 +187,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dd6/classshaka_1_1media_1_1WebMVideoClient-members.html b/docs/dd/dd6/classshaka_1_1media_1_1WebMVideoClient-members.html
index ed24c22bed..a31dbcdece 100644
--- a/docs/dd/dd6/classshaka_1_1media_1_1WebMVideoClient-members.html
+++ b/docs/dd/dd6/classshaka_1_1media_1_1WebMVideoClient-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dd8/mock__muxer__listener_8cc_source.html b/docs/dd/dd8/mock__muxer__listener_8cc_source.html
index a80ac1b95c..5f55edc8d9 100644
--- a/docs/dd/dd8/mock__muxer__listener_8cc_source.html
+++ b/docs/dd/dd8/mock__muxer__listener_8cc_source.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dd9/structshaka_1_1media_1_1mp4_1_1Box-members.html b/docs/dd/dd9/structshaka_1_1media_1_1mp4_1_1Box-members.html
index 2ef621adca..9439b6df63 100644
--- a/docs/dd/dd9/structshaka_1_1media_1_1mp4_1_1Box-members.html
+++ b/docs/dd/dd9/structshaka_1_1media_1_1mp4_1_1Box-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html b/docs/dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html
index 1de5588f86..da931e1396 100644
--- a/docs/dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html
+++ b/docs/dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html
@@ -150,7 +150,7 @@ virtual int64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el"
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/de7/structshaka_1_1media_1_1H265Pps-members.html b/docs/dd/de7/structshaka_1_1media_1_1H265Pps-members.html
index cd9b16f6ea..855b039b7f 100644
--- a/docs/dd/de7/structshaka_1_1media_1_1H265Pps-members.html
+++ b/docs/dd/de7/structshaka_1_1media_1_1H265Pps-members.html
@@ -137,7 +137,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/de7/xml__node_8h_source.html b/docs/dd/de7/xml__node_8h_source.html
index df02f1e793..bc6b38709d 100644
--- a/docs/dd/de7/xml__node_8h_source.html
+++ b/docs/dd/de7/xml__node_8h_source.html
@@ -207,31 +207,31 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;}  <span class="comment">// namespace xml</span></div>
 <div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_XML_XML_NODE_H_</span></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_aeb5b425a0d9fe472e13e508ee431307a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">shaka::xml::RepresentationXmlNode::AddVideoInfo</a></div><div class="ttdeci">bool AddVideoInfo(const MediaInfo::VideoInfo &amp;video_info, bool set_width, bool set_height, bool set_frame_rate)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00216">xml_node.cc:216</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_aeb5b425a0d9fe472e13e508ee431307a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">shaka::xml::RepresentationXmlNode::AddVideoInfo</a></div><div class="ttdeci">bool AddVideoInfo(const MediaInfo::VideoInfo &amp;video_info, bool set_width, bool set_height, bool set_frame_rate)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00215">xml_node.cc:215</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">shaka::xml::RepresentationXmlNode</a></div><div class="ttdoc">RepresentationType in MPD. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00129">xml_node.h:129</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1RepresentationBaseXmlNode_html"><div class="ttname"><a href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">shaka::xml::RepresentationBaseXmlNode</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00097">xml_node.h:97</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ac4b6c261b14ffe83e9820b76b16af1ba"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">shaka::xml::XmlNode::SetFloatingPointAttribute</a></div><div class="ttdeci">void SetFloatingPointAttribute(const char *attribute_name, double number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00119">xml_node.cc:119</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ac4b6c261b14ffe83e9820b76b16af1ba"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">shaka::xml::XmlNode::SetFloatingPointAttribute</a></div><div class="ttdeci">void SetFloatingPointAttribute(const char *attribute_name, double number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00118">xml_node.cc:118</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1AdaptationSetXmlNode_html"><div class="ttname"><a href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">shaka::xml::AdaptationSetXmlNode</a></div><div class="ttdoc">AdaptationSetType specified in MPD. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00114">xml_node.h:114</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">shaka::xml::XmlNode</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00032">xml_node.h:32</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a0be0a3e9b041978e118d994c1f13e8fb"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">shaka::xml::XmlNode::PassScopedPtr</a></div><div class="ttdeci">scoped_xml_ptr&lt; xmlNode &gt; PassScopedPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00137">xml_node.cc:137</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a52ffb838d25293eafbea9f05fb1c2d17"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">shaka::xml::XmlNode::XmlNode</a></div><div class="ttdeci">XmlNode(const char *name)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00055">xml_node.cc:55</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a68a51ea870f2a24379a9b81cb97b6ac0"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">shaka::xml::RepresentationXmlNode::AddVODOnlyInfo</a></div><div class="ttdeci">bool AddVODOnlyInfo(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00251">xml_node.cc:251</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_afc83f9dbaedc8ba0fc9cc1153ac23329"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">shaka::xml::XmlNode::SetStringAttribute</a></div><div class="ttdeci">void SetStringAttribute(const char *attribute_name, const std::string &amp;attribute)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00104">xml_node.cc:104</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a0be0a3e9b041978e118d994c1f13e8fb"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">shaka::xml::XmlNode::PassScopedPtr</a></div><div class="ttdeci">scoped_xml_ptr&lt; xmlNode &gt; PassScopedPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00136">xml_node.cc:136</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a52ffb838d25293eafbea9f05fb1c2d17"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">shaka::xml::XmlNode::XmlNode</a></div><div class="ttdeci">XmlNode(const char *name)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00054">xml_node.cc:54</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a68a51ea870f2a24379a9b81cb97b6ac0"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">shaka::xml::RepresentationXmlNode::AddVODOnlyInfo</a></div><div class="ttdeci">bool AddVODOnlyInfo(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00250">xml_node.cc:250</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_afc83f9dbaedc8ba0fc9cc1153ac23329"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">shaka::xml::XmlNode::SetStringAttribute</a></div><div class="ttdeci">void SetStringAttribute(const char *attribute_name, const std::string &amp;attribute)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00103">xml_node.cc:103</a></div></div>
 <div class="ttc" id="structshaka_1_1ContentProtectionElement_html"><div class="ttname"><a href="../../da/d43/structshaka_1_1ContentProtectionElement.html">shaka::ContentProtectionElement</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00036">content_protection_element.h:36</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a5f8deed2a9bb707c40db24374b3b7fbd"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">shaka::xml::XmlNode::AddChild</a></div><div class="ttdeci">bool AddChild(scoped_xml_ptr&lt; xmlNode &gt; child)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00062">xml_node.cc:62</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ae5cb2c3000ccbd53c0a1867db0b8a2d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">shaka::xml::XmlNode::Release</a></div><div class="ttdeci">xmlNodePtr Release()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00143">xml_node.cc:143</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_ae9ff190e1a653a348b00b5edd9d6cc60"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">shaka::xml::RepresentationXmlNode::AddLiveOnlyInfo</a></div><div class="ttdeci">bool AddLiveOnlyInfo(const MediaInfo &amp;media_info, const std::list&lt; SegmentInfo &gt; &amp;segment_infos, uint32_t start_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00298">xml_node.cc:298</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a7479055041708fb681957a838e7ecc1f"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">shaka::xml::XmlNode::SetId</a></div><div class="ttdeci">void SetId(uint32_t id)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00128">xml_node.cc:128</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a31d77d822a66991f48b67bfad3fa86d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">shaka::xml::XmlNode::AddElements</a></div><div class="ttdeci">bool AddElements(const std::vector&lt; Element &gt; &amp;elements)</div><div class="ttdoc">Adds Elements to this node using the Element struct. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00074">xml_node.cc:74</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ab15dbcc1a051218dc16f44584276ad20"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">shaka::xml::XmlNode::SetIntegerAttribute</a></div><div class="ttdeci">void SetIntegerAttribute(const char *attribute_name, uint64_t number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00111">xml_node.cc:111</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1AdaptationSetXmlNode_html_a2718eede55bb89447a74ff802b95fdb1"><div class="ttname"><a href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">shaka::xml::AdaptationSetXmlNode::AddRoleElement</a></div><div class="ttdeci">void AddRoleElement(const std::string &amp;scheme_id_uri, const std::string &amp;value)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00204">xml_node.cc:204</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a73d758186470e7dbcb4f4339eb53458c"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode::SetContent</a></div><div class="ttdeci">void SetContent(const std::string &amp;content)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00132">xml_node.cc:132</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a49050cf0e7883bfa6e8e2fb0174b2a7a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">shaka::xml::RepresentationXmlNode::AddAudioInfo</a></div><div class="ttdeci">bool AddAudioInfo(const MediaInfo::AudioInfo &amp;audio_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00243">xml_node.cc:243</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_aac9765712087dcc47a0afef4bf7849ff"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">shaka::xml::XmlNode::GetRawPtr</a></div><div class="ttdeci">xmlNodePtr GetRawPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00149">xml_node.cc:149</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a5f8deed2a9bb707c40db24374b3b7fbd"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">shaka::xml::XmlNode::AddChild</a></div><div class="ttdeci">bool AddChild(scoped_xml_ptr&lt; xmlNode &gt; child)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00061">xml_node.cc:61</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ae5cb2c3000ccbd53c0a1867db0b8a2d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">shaka::xml::XmlNode::Release</a></div><div class="ttdeci">xmlNodePtr Release()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00142">xml_node.cc:142</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_ae9ff190e1a653a348b00b5edd9d6cc60"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">shaka::xml::RepresentationXmlNode::AddLiveOnlyInfo</a></div><div class="ttdeci">bool AddLiveOnlyInfo(const MediaInfo &amp;media_info, const std::list&lt; SegmentInfo &gt; &amp;segment_infos, uint32_t start_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00297">xml_node.cc:297</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a7479055041708fb681957a838e7ecc1f"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">shaka::xml::XmlNode::SetId</a></div><div class="ttdeci">void SetId(uint32_t id)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00127">xml_node.cc:127</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a31d77d822a66991f48b67bfad3fa86d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">shaka::xml::XmlNode::AddElements</a></div><div class="ttdeci">bool AddElements(const std::vector&lt; Element &gt; &amp;elements)</div><div class="ttdoc">Adds Elements to this node using the Element struct. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00073">xml_node.cc:73</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ab15dbcc1a051218dc16f44584276ad20"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">shaka::xml::XmlNode::SetIntegerAttribute</a></div><div class="ttdeci">void SetIntegerAttribute(const char *attribute_name, uint64_t number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00110">xml_node.cc:110</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1AdaptationSetXmlNode_html_a2718eede55bb89447a74ff802b95fdb1"><div class="ttname"><a href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">shaka::xml::AdaptationSetXmlNode::AddRoleElement</a></div><div class="ttdeci">void AddRoleElement(const std::string &amp;scheme_id_uri, const std::string &amp;value)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00203">xml_node.cc:203</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a73d758186470e7dbcb4f4339eb53458c"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode::SetContent</a></div><div class="ttdeci">void SetContent(const std::string &amp;content)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00131">xml_node.cc:131</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a49050cf0e7883bfa6e8e2fb0174b2a7a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">shaka::xml::RepresentationXmlNode::AddAudioInfo</a></div><div class="ttdeci">bool AddAudioInfo(const MediaInfo::AudioInfo &amp;audio_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00242">xml_node.cc:242</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_aac9765712087dcc47a0afef4bf7849ff"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">shaka::xml::XmlNode::GetRawPtr</a></div><div class="ttdeci">xmlNodePtr GetRawPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00148">xml_node.cc:148</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/dee/box__definitions_8cc_source.html b/docs/dd/dee/box__definitions_8cc_source.html
index 674632de93..562e8cfa3c 100644
--- a/docs/dd/dee/box__definitions_8cc_source.html
+++ b/docs/dd/dee/box__definitions_8cc_source.html
@@ -2944,7 +2944,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html b/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html
index c4614b8c6f..459ebe301e 100644
--- a/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html
+++ b/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html
@@ -148,7 +148,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/df5/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun.html b/docs/dd/df5/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun.html
index 675153b9d6..af3b277082 100644
--- a/docs/dd/df5/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun.html
+++ b/docs/dd/df5/structshaka_1_1media_1_1mp4_1_1TrackFragmentRun.html
@@ -212,7 +212,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dd/df6/structshaka_1_1media_1_1mp4_1_1Metadata.html b/docs/dd/df6/structshaka_1_1media_1_1mp4_1_1Metadata.html
index 12365254a2..f41f4945c2 100644
--- a/docs/dd/df6/structshaka_1_1media_1_1mp4_1_1Metadata.html
+++ b/docs/dd/df6/structshaka_1_1media_1_1mp4_1_1Metadata.html
@@ -185,7 +185,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d0f/local__file_8h_source.html b/docs/de/d0f/local__file_8h_source.html
index ec5961a524..758dac6c26 100644
--- a/docs/de/d0f/local__file_8h_source.html
+++ b/docs/de/d0f/local__file_8h_source.html
@@ -152,7 +152,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d12/container__names_8h_source.html b/docs/de/d12/container__names_8h_source.html
index 6c5ac7beb0..128deb28e6 100644
--- a/docs/de/d12/container__names_8h_source.html
+++ b/docs/de/d12/container__names_8h_source.html
@@ -159,7 +159,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d13/ts__writer_8cc_source.html b/docs/de/d13/ts__writer_8cc_source.html
index a84bdcdbfe..393cfa0fff 100644
--- a/docs/de/d13/ts__writer_8cc_source.html
+++ b/docs/de/d13/ts__writer_8cc_source.html
@@ -361,7 +361,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d15/media__stream_8cc_source.html b/docs/de/d15/media__stream_8cc_source.html
index b122dbbfb0..2be622e0f5 100644
--- a/docs/de/d15/media__stream_8cc_source.html
+++ b/docs/de/d15/media__stream_8cc_source.html
@@ -171,8 +171,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      } <span class="keywordflow">else</span> {</div>
 <div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        <span class="comment">// We need to disconnect all its peer streams which are not connected</span></div>
 <div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        <span class="comment">// to a muxer.</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; demuxer_-&gt;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>().size(); ++i) {</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;          <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = demuxer_-&gt;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>()[i]-&gt;Start(operation);</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; demuxer_-&gt;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a>().size(); ++i) {</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;          <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = demuxer_-&gt;<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a>()[i]-&gt;Start(operation);</div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;          <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;            <span class="keywordflow">return</span> status;</div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;        }</div>
@@ -197,20 +197,20 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;}  <span class="comment">// namespace media</span></div>
 <div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_ae460a9941a4b85d511126d9a2d596f95"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#ae460a9941a4b85d511126d9a2d596f95">shaka::media::MediaStream::PullSample</a></div><div class="ttdeci">Status PullSample(scoped_refptr&lt; MediaSample &gt; *sample)</div><div class="ttdoc">Pull sample from Demuxer (triggered by Muxer). </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00024">media_stream.cc:24</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_af89c3d15b452d45bcacea9470ba43a7f"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">shaka::media::Demuxer::streams</a></div><div class="ttdeci">const std::vector&lt; MediaStream * &gt; &amp; streams()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00068">demuxer.h:68</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_af5eca8f2e63e762d52fcc30c5f8c38b0"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#af5eca8f2e63e762d52fcc30c5f8c38b0">shaka::media::MediaStream::Start</a></div><div class="ttdeci">Status Start(MediaStreamOperation operation)</div><div class="ttdoc">Start the stream for pushing or pulling. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00062">media_stream.cc:62</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_ae91f45b0eacab47632f069543b709b58"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#ae91f45b0eacab47632f069543b709b58">shaka::media::MediaStream::PushSample</a></div><div class="ttdeci">Status PushSample(const scoped_refptr&lt; MediaSample &gt; &amp;sample)</div><div class="ttdoc">Push sample to Muxer (triggered by Demuxer). </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00039">media_stream.cc:39</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_a86598d6228ab8163d27fb855142c9f73"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#a86598d6228ab8163d27fb855142c9f73">shaka::media::MediaStream::MediaStream</a></div><div class="ttdeci">MediaStream(scoped_refptr&lt; StreamInfo &gt; info, Demuxer *demuxer)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00019">media_stream.cc:19</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_aafb74f83b0de2c787336bad9f096ce50"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">shaka::media::Demuxer::streams</a></div><div class="ttdeci">const std::vector&lt; std::unique_ptr&lt; MediaStream &gt; &gt; &amp; streams()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00068">demuxer.h:68</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Demuxer_html"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00032">demuxer.h:32</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_a98e53e299c7258419623b3d709553562"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#a98e53e299c7258419623b3d709553562">shaka::media::MediaStream::Connect</a></div><div class="ttdeci">void Connect(Muxer *muxer)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00055">media_stream.cc:55</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00207">demuxer.cc:207</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00197">demuxer.cc:197</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Muxer_html"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/df6/muxer_8h_source.html#l00033">muxer.h:33</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaStream_html_a51d85facae4f9d8d89b97a42148769dd"><div class="ttname"><a href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#a51d85facae4f9d8d89b97a42148769dd">shaka::media::MediaStream::ToString</a></div><div class="ttdeci">std::string ToString() const </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d15/media__stream_8cc_source.html#l00103">media_stream.cc:103</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d16/classshaka_1_1media_1_1TextTrackConfig-members.html b/docs/de/d16/classshaka_1_1media_1_1TextTrackConfig-members.html
index 50a591a048..3708a419e6 100644
--- a/docs/de/d16/classshaka_1_1media_1_1TextTrackConfig-members.html
+++ b/docs/de/d16/classshaka_1_1media_1_1TextTrackConfig-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d17/cluster__builder_8cc_source.html b/docs/de/d17/cluster__builder_8cc_source.html
index 13b19438fe..65cfa36e55 100644
--- a/docs/de/d17/cluster__builder_8cc_source.html
+++ b/docs/de/d17/cluster__builder_8cc_source.html
@@ -346,7 +346,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d1a/classshaka_1_1media_1_1wvm_1_1WvmMediaParser-members.html b/docs/de/d1a/classshaka_1_1media_1_1wvm_1_1WvmMediaParser-members.html
index b6bf507121..e107901aa5 100644
--- a/docs/de/d1a/classshaka_1_1media_1_1wvm_1_1WvmMediaParser-members.html
+++ b/docs/de/d1a/classshaka_1_1media_1_1wvm_1_1WvmMediaParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html b/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html
index d187c58297..41ab76694d 100644
--- a/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html
+++ b/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html
@@ -336,7 +336,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d22/aes__pattern__cryptor_8cc_source.html b/docs/de/d22/aes__pattern__cryptor_8cc_source.html
index fb926ec1fb..2197761d46 100644
--- a/docs/de/d22/aes__pattern__cryptor_8cc_source.html
+++ b/docs/de/d22/aes__pattern__cryptor_8cc_source.html
@@ -193,12 +193,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">shaka::media::AesPatternCryptor::kSkipIfCryptByteBlockRemaining</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00035">aes_pattern_cryptor.h:35</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a96dde16f12a82a563c77f6d5522571f3"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">shaka::media::AesCryptor::iv</a></div><div class="ttdeci">const std::vector&lt; uint8_t &gt; &amp; iv() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d42/aes__cryptor_8h_source.html#l00081">aes_cryptor.h:81</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_a54fd35d7782d3b4948c7eb68387711f0"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">shaka::media::AesPatternCryptor::PatternEncryptionMode</a></div><div class="ttdeci">PatternEncryptionMode</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00021">aes_pattern_cryptor.h:21</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">aes_cryptor.cc:69</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesCryptor_html_a4875146da4761bb757d6b00132ae6fea"><div class="ttname"><a href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor::SetIv</a></div><div class="ttdeci">bool SetIv(const std::vector&lt; uint8_t &gt; &amp;iv)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">aes_cryptor.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_abb94f2d6a527b12854e81839fd10e1d5"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">shaka::media::AesPatternCryptor::AesPatternCryptor</a></div><div class="ttdeci">AesPatternCryptor(uint8_t crypt_byte_block, uint8_t skip_byte_block, PatternEncryptionMode encryption_mode, ConstantIvFlag constant_iv_flag, std::unique_ptr&lt; AesCryptor &gt; cryptor)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d22/aes__pattern__cryptor_8cc_source.html#l00016">aes_pattern_cryptor.cc:16</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html b/docs/de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html
index 708eb68966..de09124a34 100644
--- a/docs/de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html
+++ b/docs/de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html
@@ -140,7 +140,7 @@ static const uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>kElem
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d29/structshaka_1_1media_1_1mp4_1_1TrackExtends.html b/docs/de/d29/structshaka_1_1media_1_1mp4_1_1TrackExtends.html
index d057d145c8..66726523e6 100644
--- a/docs/de/d29/structshaka_1_1media_1_1mp4_1_1TrackExtends.html
+++ b/docs/de/d29/structshaka_1_1media_1_1mp4_1_1TrackExtends.html
@@ -194,7 +194,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d33/classshaka_1_1media_1_1WebMTracksParser-members.html b/docs/de/d33/classshaka_1_1media_1_1WebMTracksParser-members.html
index 18fd61192c..ec44629120 100644
--- a/docs/de/d33/classshaka_1_1media_1_1WebMTracksParser-members.html
+++ b/docs/de/d33/classshaka_1_1media_1_1WebMTracksParser-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d33/structshaka_1_1media_1_1H265Pps.html b/docs/de/d33/structshaka_1_1media_1_1H265Pps.html
index c69792c60c..af58dd7a38 100644
--- a/docs/de/d33/structshaka_1_1media_1_1H265Pps.html
+++ b/docs/de/d33/structshaka_1_1media_1_1H265Pps.html
@@ -224,7 +224,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>chroma_qp_offset_list
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d34/offset__byte__queue_8h_source.html b/docs/de/d34/offset__byte__queue_8h_source.html
index 959ba96730..1fe1c448be 100644
--- a/docs/de/d34/offset__byte__queue_8h_source.html
+++ b/docs/de/d34/offset__byte__queue_8h_source.html
@@ -143,7 +143,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d3c/h26x__byte__to__unit__stream__converter_8cc_source.html b/docs/de/d3c/h26x__byte__to__unit__stream__converter_8cc_source.html
index eb788501c4..4c50204f68 100644
--- a/docs/de/d3c/h26x__byte__to__unit__stream__converter_8cc_source.html
+++ b/docs/de/d3c/h26x__byte__to__unit__stream__converter_8cc_source.html
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d3c/macros_8h_source.html b/docs/de/d3c/macros_8h_source.html
index 1024c174ce..25ce07fcba 100644
--- a/docs/de/d3c/macros_8h_source.html
+++ b/docs/de/d3c/macros_8h_source.html
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d3e/buffer__reader_8h_source.html b/docs/de/d3e/buffer__reader_8h_source.html
index 7f472e708d..67cec56711 100644
--- a/docs/de/d3e/buffer__reader_8h_source.html
+++ b/docs/de/d3e/buffer__reader_8h_source.html
@@ -163,7 +163,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d3e/classshaka_1_1media_1_1H264Parser-members.html b/docs/de/d3e/classshaka_1_1media_1_1H264Parser-members.html
index 2f150190ac..1d6421a0f3 100644
--- a/docs/de/d3e/classshaka_1_1media_1_1H264Parser-members.html
+++ b/docs/de/d3e/classshaka_1_1media_1_1H264Parser-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d43/classshaka_1_1media_1_1mp2t_1_1PesPacket-members.html b/docs/de/d43/classshaka_1_1media_1_1mp2t_1_1PesPacket-members.html
index 7834524c96..297ff772d1 100644
--- a/docs/de/d43/classshaka_1_1media_1_1mp2t_1_1PesPacket-members.html
+++ b/docs/de/d43/classshaka_1_1media_1_1mp2t_1_1PesPacket-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d49/classshaka_1_1media_1_1DecryptConfig.html b/docs/de/d49/classshaka_1_1media_1_1DecryptConfig.html
index e6f48eb77c..30ebd2ab53 100644
--- a/docs/de/d49/classshaka_1_1media_1_1DecryptConfig.html
+++ b/docs/de/d49/classshaka_1_1media_1_1DecryptConfig.html
@@ -249,7 +249,7 @@ static const size_t&#160;</td><td class="memItemRight" valign="bottom"><a class=
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d4a/muxer__listener__internal_8h_source.html b/docs/de/d4a/muxer__listener__internal_8h_source.html
index d4e9e6434b..0f9418e56e 100644
--- a/docs/de/d4a/muxer__listener__internal_8h_source.html
+++ b/docs/de/d4a/muxer__listener__internal_8h_source.html
@@ -145,7 +145,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d52/classshaka_1_1Representation.html b/docs/de/d52/classshaka_1_1Representation.html
index 25e1d48940..b373c24e2b 100644
--- a/docs/de/d52/classshaka_1_1Representation.html
+++ b/docs/de/d52/classshaka_1_1Representation.html
@@ -145,7 +145,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../de/d52/classshaka_1_1Representation.html">Representation</a> class contains references to a single media stream, as well as optional ContentProtection elements for that stream. </p>
 
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00428">428</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00425">425</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a997138fcaa5deef5151a64a2d7ce6aeb"></a>
 <div class="memitem">
@@ -200,7 +200,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01035">1035</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01031">1031</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -234,7 +234,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01092">1092</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01088">1088</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -285,7 +285,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01104">1104</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01100">1100</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -303,7 +303,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>Copy of &lt;Representation&gt;. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01144">1144</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01140">1140</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -329,7 +329,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>ID number for &lt;Representation&gt;. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00503">503</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00500">500</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 
 </div>
 </div>
@@ -348,7 +348,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 <p>Tries to initialize the instance. If this does not succeed, the instance should not be used. </p>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01050">1050</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01046">1046</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -381,7 +381,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01128">1128</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01124">1124</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -400,7 +400,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><div class="memdoc">
 <p>By calling this methods, the next time <a class="el" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml()</a> is called, the corresponding attributes will not be set. For example, if SuppressOnce(kSuppressWidth) is called, then <a class="el" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml()</a> will return a &lt;Representation&gt; element without a  attribute. Note that it only applies to the next call to <a class="el" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml()</a>, calling <a class="el" href="../../de/d52/classshaka_1_1Representation.html#a606afa5df6a90f49faad0ce427b7e960">GetXml()</a> again without calling this methods will return a &lt;Representation&gt; element with the attribute. This may be called multiple times to set different (or the same) flags. </p>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01207">1207</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01203">1203</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -445,7 +445,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </dl>
 <dl class="section attention"><dt>Attention</dt><dd>This might get removed once DASH IF IOP specification makes a a clear guideline on how to handle key rotation. Also to get this working with shaka-player, this method <em>DOES NOT</em> update the PSSH element. Instead, it removes the element regardless of the content of <em>pssh</em>. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01098">1098</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html#l01094">1094</a> of file <a class="el" href="../../dd/d11/mpd__builder_8cc_source.html">mpd_builder.cc</a>.</p>
 
 </div>
 </div>
@@ -456,7 +456,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d55/structshaka_1_1media_1_1mp4_1_1Language-members.html b/docs/de/d55/structshaka_1_1media_1_1mp4_1_1Language-members.html
index 4cd1c8ca8f..c1a371ee1d 100644
--- a/docs/de/d55/structshaka_1_1media_1_1mp4_1_1Language-members.html
+++ b/docs/de/d55/structshaka_1_1media_1_1mp4_1_1Language-members.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d5b/adts__header_8cc_source.html b/docs/de/d5b/adts__header_8cc_source.html
index ef015d973a..1504cc8000 100644
--- a/docs/de/d5b/adts__header_8cc_source.html
+++ b/docs/de/d5b/adts__header_8cc_source.html
@@ -207,7 +207,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d5c/mpd__flags_8h_source.html b/docs/de/d5c/mpd__flags_8h_source.html
index 7cbe2c2442..acf298c2a1 100644
--- a/docs/de/d5c/mpd__flags_8h_source.html
+++ b/docs/de/d5c/mpd__flags_8h_source.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d60/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter-members.html b/docs/de/d60/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter-members.html
index 65692436bc..50f76a31e4 100644
--- a/docs/de/d60/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter-members.html
+++ b/docs/de/d60/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html b/docs/de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html
index ca432259c1..68d14a016c 100644
--- a/docs/de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html
+++ b/docs/de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html
@@ -257,7 +257,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d6c/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry-members.html b/docs/de/d6c/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry-members.html
index e58b1abb59..a34d5b07f4 100644
--- a/docs/de/d6c/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry-members.html
+++ b/docs/de/d6c/structshaka_1_1media_1_1mp4_1_1SampleToGroupEntry-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d6e/language__utils_8h_source.html b/docs/de/d6e/language__utils_8h_source.html
index f4ccc63c8e..5375236595 100644
--- a/docs/de/d6e/language__utils_8h_source.html
+++ b/docs/de/d6e/language__utils_8h_source.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d70/http__key__fetcher_8cc_source.html b/docs/de/d70/http__key__fetcher_8cc_source.html
index 1eba97cf78..3f5b2ccd09 100644
--- a/docs/de/d70/http__key__fetcher_8cc_source.html
+++ b/docs/de/d70/http__key__fetcher_8cc_source.html
@@ -238,7 +238,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d77/webm__content__encodings__client_8cc_source.html b/docs/de/d77/webm__content__encodings__client_8cc_source.html
index a53633fd89..f1235dab67 100644
--- a/docs/de/d77/webm__content__encodings__client_8cc_source.html
+++ b/docs/de/d77/webm__content__encodings__client_8cc_source.html
@@ -94,274 +94,271 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_content_encodings_client.h&quot;</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;</div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_constants.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="keyword">namespace </span>media {</div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;</div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;WebMContentEncodingsClient::WebMContentEncodingsClient()</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;    : content_encryption_encountered_(false), content_encodings_ready_(false) {}</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;WebMContentEncodingsClient::~WebMContentEncodingsClient() {</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  STLDeleteElements(&amp;content_encodings_);</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;}</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">const</span> ContentEncodings&amp; WebMContentEncodingsClient::content_encodings()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  DCHECK(content_encodings_ready_);</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keywordflow">return</span> content_encodings_;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;}</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">   26</a></span>&#160;<a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">WebMContentEncodingsClient::OnListStart</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) {</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodings) {</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    DCHECK(!cur_content_encoding_.get());</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    DCHECK(!content_encryption_encountered_);</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    STLDeleteElements(&amp;content_encodings_);</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    content_encodings_ready_ = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  }</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncoding) {</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    DCHECK(!cur_content_encoding_.get());</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    DCHECK(!content_encryption_encountered_);</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    cur_content_encoding_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a>());</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  }</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncryption) {</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordflow">if</span> (content_encryption_encountered_) {</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncryption.&quot;</span>;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    }</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    content_encryption_encountered_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  }</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAESSettings) {</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  }</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;}</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;<span class="comment">// Mandatory occurrence restriction is checked in this function. Multiple</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="comment">// occurrence restriction is checked in OnUInt and OnBinary.</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnListEnd(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) {</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodings) {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="comment">// ContentEncoding element is mandatory. Check this!</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">if</span> (content_encodings_.empty()) {</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing ContentEncoding.&quot;</span>;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    }</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    content_encodings_ready_ = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  }</div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/webm/webm_constants.h&quot;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="keyword">namespace </span>media {</div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;WebMContentEncodingsClient::WebMContentEncodingsClient()</div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;    : content_encryption_encountered_(false), content_encodings_ready_(false) {}</div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;WebMContentEncodingsClient::~WebMContentEncodingsClient() {}</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">const</span> ContentEncodings&amp; WebMContentEncodingsClient::content_encodings()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  DCHECK(content_encodings_ready_);</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  <span class="keywordflow">return</span> content_encodings_;</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;}</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div>
+<div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">   23</a></span>&#160;<a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* <a class="code" href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">WebMContentEncodingsClient::OnListStart</a>(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) {</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodings) {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    DCHECK(!cur_content_encoding_.get());</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    DCHECK(!content_encryption_encountered_);</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    content_encodings_.clear();</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    content_encodings_ready_ = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  }</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncoding) {</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    DCHECK(!cur_content_encoding_.get());</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    DCHECK(!content_encryption_encountered_);</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    cur_content_encoding_.reset(<span class="keyword">new</span> <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a>());</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  }</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncryption) {</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">if</span> (content_encryption_encountered_) {</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncryption.&quot;</span>;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    }</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    content_encryption_encountered_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  }</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAESSettings) {</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">this</span>;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  }</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;}</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="comment">// Mandatory occurrence restriction is checked in this function. Multiple</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="comment">// occurrence restriction is checked in OnUInt and OnBinary.</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnListEnd(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) {</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodings) {</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="comment">// ContentEncoding element is mandatory. Check this!</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keywordflow">if</span> (content_encodings_.empty()) {</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing ContentEncoding.&quot;</span>;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    }</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    content_encodings_ready_ = <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  }</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncoding) {</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncoding) {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="comment">//</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="comment">// Specify default values to missing mandatory elements.</span></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="comment">//</span></div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;order() == <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">ContentEncoding::kOrderInvalid</a>) {</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;      <span class="comment">// Default value of encoding order is 0, which should only be used on the</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      <span class="comment">// first ContentEncoding.</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      <span class="keywordflow">if</span> (!content_encodings_.empty()) {</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing ContentEncodingOrder.&quot;</span>;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      }</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      cur_content_encoding_-&gt;set_order(0);</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    }</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="comment">//</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="comment">// Specify default values to missing mandatory elements.</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="comment">//</span></div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;order() == <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">ContentEncoding::kOrderInvalid</a>) {</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;      <span class="comment">// Default value of encoding order is 0, which should only be used on the</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      <span class="comment">// first ContentEncoding.</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      <span class="keywordflow">if</span> (!content_encodings_.empty()) {</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing ContentEncodingOrder.&quot;</span>;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      }</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      cur_content_encoding_-&gt;set_order(0);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    }</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;scope() == ContentEncoding::kScopeInvalid)</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      cur_content_encoding_-&gt;set_scope(ContentEncoding::kScopeAllFrameContents);</div>
 <div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;scope() == ContentEncoding::kScopeInvalid)</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      cur_content_encoding_-&gt;set_scope(ContentEncoding::kScopeAllFrameContents);</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() == ContentEncoding::kTypeInvalid)</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      cur_content_encoding_-&gt;set_type(ContentEncoding::kTypeCompression);</div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() == ContentEncoding::kTypeInvalid)</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;      cur_content_encoding_-&gt;set_type(ContentEncoding::kTypeCompression);</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="comment">// Check for elements valid in spec but not supported for now.</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() == ContentEncoding::kTypeCompression) {</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentCompression not supported.&quot;</span>;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    }</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="comment">// Enforce mandatory elements without default values.</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    DCHECK(cur_content_encoding_-&gt;type() == ContentEncoding::kTypeEncryption);</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordflow">if</span> (!content_encryption_encountered_) {</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentEncodingType is encryption but&quot;</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; ContentEncryption is missing.&quot;</span>;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    }</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    content_encodings_.push_back(cur_content_encoding_.release());</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    content_encryption_encountered_ = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  }</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncryption) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;    <span class="comment">// Specify default value for elements that are not present.</span></div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;encryption_algo() ==</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;        ContentEncoding::kEncAlgoInvalid) {</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;      cur_content_encoding_-&gt;set_encryption_algo(</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;          ContentEncoding::kEncAlgoNotEncrypted);</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    }</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  }</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAESSettings) {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;cipher_mode() ==</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        ContentEncoding::kCipherModeInvalid)</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;      cur_content_encoding_-&gt;set_cipher_mode(ContentEncoding::kCipherModeCtr);</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  }</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;}</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;<span class="comment">// Multiple occurrence restriction and range are checked in this function.</span></div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="comment">// Mandatory occurrence restriction is checked in OnListEnd.</span></div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) {</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingOrder) {</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;order() != <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">ContentEncoding::kOrderInvalid</a>) {</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingOrder.&quot;</span>;</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;    }</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    <span class="keywordflow">if</span> (val != static_cast&lt;int64_t&gt;(content_encodings_.size())) {</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      <span class="comment">// According to the spec, encoding order starts with 0 and counts upwards.</span></div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingOrder.&quot;</span>;</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    }</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    cur_content_encoding_-&gt;set_order(val);</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  }</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingScope) {</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;scope() != ContentEncoding::kScopeInvalid) {</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingScope.&quot;</span>;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;    }</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="keywordflow">if</span> (val == ContentEncoding::kScopeInvalid ||</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;        val &gt; ContentEncoding::kScopeMax) {</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingScope.&quot;</span>;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    }</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    <span class="keywordflow">if</span> (val &amp; ContentEncoding::kScopeNextContentEncodingData) {</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Encoded next ContentEncoding is not &quot;</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;                    <span class="stringliteral">&quot;supported.&quot;</span>;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    }</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    cur_content_encoding_-&gt;set_scope(static_cast&lt;ContentEncoding::Scope&gt;(val));</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  }</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingType) {</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() != ContentEncoding::kTypeInvalid) {</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingType.&quot;</span>;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    }</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    <span class="keywordflow">if</span> (val == ContentEncoding::kTypeCompression) {</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentCompression not supported.&quot;</span>;</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    }</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    <span class="keywordflow">if</span> (val != ContentEncoding::kTypeEncryption) {</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingType &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    }</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    cur_content_encoding_-&gt;set_type(static_cast&lt;ContentEncoding::Type&gt;(val));</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  }</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAlgo) {</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;encryption_algo() !=</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;        ContentEncoding::kEncAlgoInvalid) {</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncAlgo.&quot;</span>;</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    }</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    <span class="keywordflow">if</span> (val &lt; ContentEncoding::kEncAlgoNotEncrypted ||</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;        val &gt; ContentEncoding::kEncAlgoAes) {</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncAlgo &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    }</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    cur_content_encoding_-&gt;set_encryption_algo(</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;        static_cast&lt;ContentEncoding::EncryptionAlgo&gt;(val));</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  }</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdAESSettingsCipherMode) {</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;cipher_mode() !=</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;        ContentEncoding::kCipherModeInvalid) {</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple AESSettingsCipherMode.&quot;</span>;</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    }</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">if</span> (val != ContentEncoding::kCipherModeCtr) {</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected AESSettingsCipherMode &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    }</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    cur_content_encoding_-&gt;set_cipher_mode(</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;        static_cast&lt;ContentEncoding::CipherMode&gt;(val));</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  }</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;}</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;<span class="comment">// Multiple occurrence restriction is checked in this function.  Mandatory</span></div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;<span class="comment">// restriction is checked in OnListEnd.</span></div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>,</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;                                          <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;                                          <span class="keywordtype">int</span> size) {</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  DCHECK(cur_content_encoding_.get());</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;  DCHECK(data);</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;  DCHECK_GT(size, 0);</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncKeyID) {</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;    <span class="keywordflow">if</span> (!cur_content_encoding_-&gt;encryption_key_id().empty()) {</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncKeyID&quot;</span>;</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;    }</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;    cur_content_encoding_-&gt;SetEncryptionKeyId(data, size);</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  }</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;}</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="comment">// Check for elements valid in spec but not supported for now.</span></div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() == ContentEncoding::kTypeCompression) {</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentCompression not supported.&quot;</span>;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    }</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="comment">// Enforce mandatory elements without default values.</span></div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    DCHECK_EQ(cur_content_encoding_-&gt;type(), ContentEncoding::kTypeEncryption);</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keywordflow">if</span> (!content_encryption_encountered_) {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentEncodingType is encryption but&quot;</span></div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; ContentEncryption is missing.&quot;</span>;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    }</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    content_encodings_.push_back(std::move(cur_content_encoding_));</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    content_encryption_encountered_ = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  }</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncryption) {</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    DCHECK(cur_content_encoding_.get());</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    <span class="comment">// Specify default value for elements that are not present.</span></div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;encryption_algo() ==</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        ContentEncoding::kEncAlgoInvalid) {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;      cur_content_encoding_-&gt;set_encryption_algo(</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;          ContentEncoding::kEncAlgoNotEncrypted);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    }</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  }</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAESSettings) {</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;cipher_mode() ==</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        ContentEncoding::kCipherModeInvalid)</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;      cur_content_encoding_-&gt;set_cipher_mode(ContentEncoding::kCipherModeCtr);</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  }</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;}</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;<span class="comment">// Multiple occurrence restriction and range are checked in this function.</span></div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;<span class="comment">// Mandatory occurrence restriction is checked in OnListEnd.</span></div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnUInt(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, int64_t val) {</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  DCHECK(cur_content_encoding_.get());</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingOrder) {</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;order() != <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">ContentEncoding::kOrderInvalid</a>) {</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingOrder.&quot;</span>;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    }</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">if</span> (val != static_cast&lt;int64_t&gt;(content_encodings_.size())) {</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;      <span class="comment">// According to the spec, encoding order starts with 0 and counts upwards.</span></div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingOrder.&quot;</span>;</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    }</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    cur_content_encoding_-&gt;set_order(val);</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  }</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingScope) {</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;scope() != ContentEncoding::kScopeInvalid) {</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingScope.&quot;</span>;</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    }</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;    <span class="keywordflow">if</span> (val == ContentEncoding::kScopeInvalid ||</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        val &gt; ContentEncoding::kScopeMax) {</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingScope.&quot;</span>;</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    }</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <span class="keywordflow">if</span> (val &amp; ContentEncoding::kScopeNextContentEncodingData) {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Encoded next ContentEncoding is not &quot;</span></div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;                    <span class="stringliteral">&quot;supported.&quot;</span>;</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    }</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    cur_content_encoding_-&gt;set_scope(static_cast&lt;ContentEncoding::Scope&gt;(val));</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  }</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncodingType) {</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;type() != ContentEncoding::kTypeInvalid) {</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncodingType.&quot;</span>;</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    }</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    <span class="keywordflow">if</span> (val == ContentEncoding::kTypeCompression) {</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ContentCompression not supported.&quot;</span>;</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    }</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    <span class="keywordflow">if</span> (val != ContentEncoding::kTypeEncryption) {</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncodingType &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    }</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    cur_content_encoding_-&gt;set_type(static_cast&lt;ContentEncoding::Type&gt;(val));</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  }</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncAlgo) {</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;encryption_algo() !=</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;        ContentEncoding::kEncAlgoInvalid) {</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncAlgo.&quot;</span>;</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    }</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    <span class="keywordflow">if</span> (val &lt; ContentEncoding::kEncAlgoNotEncrypted ||</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;        val &gt; ContentEncoding::kEncAlgoAes) {</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected ContentEncAlgo &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    }</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    cur_content_encoding_-&gt;set_encryption_algo(</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;        static_cast&lt;ContentEncoding::EncryptionAlgo&gt;(val));</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;  }</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdAESSettingsCipherMode) {</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;    <span class="keywordflow">if</span> (cur_content_encoding_-&gt;cipher_mode() !=</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;        ContentEncoding::kCipherModeInvalid) {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple AESSettingsCipherMode.&quot;</span>;</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    }</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    <span class="keywordflow">if</span> (val != ContentEncoding::kCipherModeCtr) {</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected AESSettingsCipherMode &quot;</span> &lt;&lt; val &lt;&lt; <span class="stringliteral">&quot;.&quot;</span>;</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    }</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    cur_content_encoding_-&gt;set_cipher_mode(</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;        static_cast&lt;ContentEncoding::CipherMode&gt;(val));</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  }</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;}</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;<span class="comment">// Multiple occurrence restriction is checked in this function.  Mandatory</span></div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;<span class="comment">// restriction is checked in OnListEnd.</span></div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;<span class="keywordtype">bool</span> WebMContentEncodingsClient::OnBinary(<span class="keywordtype">int</span> <span class="keywordtype">id</span>,</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;                                          <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;                                          <span class="keywordtype">int</span> size) {</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  DCHECK(cur_content_encoding_.get());</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  DCHECK(data);</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  DCHECK_GT(size, 0);</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;  <span class="keywordflow">if</span> (<span class="keywordtype">id</span> == kWebMIdContentEncKeyID) {</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    <span class="keywordflow">if</span> (!cur_content_encoding_-&gt;encryption_key_id().empty()) {</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unexpected multiple ContentEncKeyID&quot;</span>;</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;    }</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;    cur_content_encoding_-&gt;SetEncryptionKeyId(data, size);</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;  }</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  <span class="comment">// This should not happen if WebMListParser is working properly.</span></div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  DCHECK(<span class="keyword">false</span>);</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;}</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1ContentEncoding_html"><div class="ttname"><a href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">shaka::media::ContentEncoding</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d3b/webm__content__encodings_8h_source.html#l00015">webm_content_encodings.h:15</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ContentEncoding_html_a3ba32d5ca8b0688b2dc6b2ec8a5be6d2"><div class="ttname"><a href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">shaka::media::ContentEncoding::kOrderInvalid</a></div><div class="ttdeci">static const int kOrderInvalid</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d3b/webm__content__encodings_8h_source.html#l00020">webm_content_encodings.h:20</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html_a7b8b5447b3d573657f6dc029d2e6d8b7"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">shaka::media::WebMContentEncodingsClient::OnListStart</a></div><div class="ttdeci">WebMParserClient * OnListStart(int id) override</div><div class="ttdoc">WebMParserClient methods. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d77/webm__content__encodings__client_8cc_source.html#l00026">webm_content_encodings_client.cc:26</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMContentEncodingsClient_html_a7b8b5447b3d573657f6dc029d2e6d8b7"><div class="ttname"><a href="../../d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html#a7b8b5447b3d573657f6dc029d2e6d8b7">shaka::media::WebMContentEncodingsClient::OnListStart</a></div><div class="ttdeci">WebMParserClient * OnListStart(int id) override</div><div class="ttdoc">WebMParserClient methods. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d77/webm__content__encodings__client_8cc_source.html#l00023">webm_content_encodings_client.cc:23</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMParserClient_html"><div class="ttname"><a href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">shaka::media::WebMParserClient</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d46/webm__parser_8h_source.html#l00030">webm_parser.h:30</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d7b/mp4__media__parser_8h_source.html b/docs/de/d7b/mp4__media__parser_8h_source.html
index 40ca6dc3ed..453d39b306 100644
--- a/docs/de/d7b/mp4__media__parser_8h_source.html
+++ b/docs/de/d7b/mp4__media__parser_8h_source.html
@@ -204,7 +204,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d7e/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi.html b/docs/de/d7e/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi.html
index 905300e1dc..9eef7efb80 100644
--- a/docs/de/d7e/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi.html
+++ b/docs/de/d7e/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi.html
@@ -147,7 +147,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d83/box__definitions__comparison_8h_source.html b/docs/de/d83/box__definitions__comparison_8h_source.html
index 5f9ba85644..e00d014e8e 100644
--- a/docs/de/d83/box__definitions__comparison_8h_source.html
+++ b/docs/de/d83/box__definitions__comparison_8h_source.html
@@ -592,7 +592,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d83/classshaka_1_1media_1_1LocalFile-members.html b/docs/de/d83/classshaka_1_1media_1_1LocalFile-members.html
index e5e8d1883a..55d4704fc8 100644
--- a/docs/de/d83/classshaka_1_1media_1_1LocalFile-members.html
+++ b/docs/de/d83/classshaka_1_1media_1_1LocalFile-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d87/structshaka_1_1media_1_1wvm_1_1PrevSampleData-members.html b/docs/de/d87/structshaka_1_1media_1_1wvm_1_1PrevSampleData-members.html
index f669aa22a7..0e5d698a83 100644
--- a/docs/de/d87/structshaka_1_1media_1_1wvm_1_1PrevSampleData-members.html
+++ b/docs/de/d87/structshaka_1_1media_1_1wvm_1_1PrevSampleData-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d8d/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader-members.html b/docs/de/d8d/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader-members.html
index 25dfbbb6e8..f3e7c6d6a6 100644
--- a/docs/de/d8d/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader-members.html
+++ b/docs/de/d8d/structshaka_1_1media_1_1mp4_1_1MovieFragmentHeader-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/d93/classshaka_1_1media_1_1VP8Parser-members.html b/docs/de/d93/classshaka_1_1media_1_1VP8Parser-members.html
index e35d68f366..3193fa7155 100644
--- a/docs/de/d93/classshaka_1_1media_1_1VP8Parser-members.html
+++ b/docs/de/d93/classshaka_1_1media_1_1VP8Parser-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/da9/structshaka_1_1Element.html b/docs/de/da9/structshaka_1_1Element.html
index b98d37fdb0..3dd91a8f21 100644
--- a/docs/de/da9/structshaka_1_1Element.html
+++ b/docs/de/da9/structshaka_1_1Element.html
@@ -120,7 +120,7 @@ std::vector&lt; <a class="el" href="../../de/da9/structshaka_1_1Element.html">El
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dab/es__parser__h26x_8cc_source.html b/docs/de/dab/es__parser__h26x_8cc_source.html
index 758f17495e..8c5be0a39e 100644
--- a/docs/de/dab/es__parser__h26x_8cc_source.html
+++ b/docs/de/dab/es__parser__h26x_8cc_source.html
@@ -410,7 +410,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dad/validate__flag_8cc_source.html b/docs/de/dad/validate__flag_8cc_source.html
index e74d8c162b..881a267e4d 100644
--- a/docs/de/dad/validate__flag_8cc_source.html
+++ b/docs/de/dad/validate__flag_8cc_source.html
@@ -132,7 +132,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/db3/classshaka_1_1media_1_1TextTrackConfig.html b/docs/de/db3/classshaka_1_1media_1_1TextTrackConfig.html
index 0e74e778e6..9efc55f4ec 100644
--- a/docs/de/db3/classshaka_1_1media_1_1TextTrackConfig.html
+++ b/docs/de/db3/classshaka_1_1media_1_1TextTrackConfig.html
@@ -125,7 +125,7 @@ const std::string &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>id
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/db4/classshaka_1_1media_1_1H26xBitReader.html b/docs/de/db4/classshaka_1_1media_1_1H26xBitReader.html
index 814d65a334..2385c64bb4 100644
--- a/docs/de/db4/classshaka_1_1media_1_1H26xBitReader.html
+++ b/docs/de/db4/classshaka_1_1media_1_1H26xBitReader.html
@@ -134,7 +134,7 @@ size_t&#160;</td><td class="memItemRight" valign="bottom"><b>NumEmulationPrevent
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dc1/demuxer_8h_source.html b/docs/de/dc1/demuxer_8h_source.html
index a7edd7795e..b03d1ea47a 100644
--- a/docs/de/dc1/demuxer_8h_source.html
+++ b/docs/de/dc1/demuxer_8h_source.html
@@ -131,63 +131,65 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">Cancel</a>();</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">   68</a></span>&#160;  <span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>() { <span class="keywordflow">return</span> streams_; }</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
-<div class="line"><a name="l00072"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">   72</a></span>&#160;  MediaContainerName <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">container_name</a>() { <span class="keywordflow">return</span> container_name_; }</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keyword">struct </span>QueuedSample {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    QueuedSample(uint32_t track_id, scoped_refptr&lt;MediaSample&gt; sample);</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    ~QueuedSample();</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    uint32_t track_id;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    scoped_refptr&lt;MediaSample&gt; sample;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  };</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="comment">// Parser init event.</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keywordtype">void</span> ParserInitEvent(<span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;&amp; <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">streams</a>);</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="comment">// Parser new sample event handler. Queues the samples if init event has not</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="comment">// been received, otherwise calls PushSample() to push the sample to</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="comment">// corresponding stream.</span></div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keywordtype">bool</span> NewSampleEvent(uint32_t track_id,</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;                      <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample);</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// Helper function to push the sample to corresponding stream.</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keywordtype">bool</span> PushSample(uint32_t track_id, <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample);</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  std::string file_name_;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  File* media_file_;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="keywordtype">bool</span> init_event_received_;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  Status init_parsing_status_;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// Queued samples received in NewSampleEvent() before ParserInitEvent().</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  std::deque&lt;QueuedSample&gt; queued_samples_;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  std::unique_ptr&lt;MediaParser&gt; parser_;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  std::vector&lt;MediaStream*&gt; streams_;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  MediaContainerName container_name_;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; buffer_;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  std::unique_ptr&lt;KeySource&gt; key_source_;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">bool</span> cancelled_;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">Demuxer</a>);</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;};</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_DEMUXER_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a385c93fd8d589b7d3bccd35e14c58290"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">shaka::media::Demuxer::container_name</a></div><div class="ttdeci">MediaContainerName container_name()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00072">demuxer.h:72</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a9e0b4a430603fdf4639c2153622ae1a2"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">shaka::media::Demuxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00173">demuxer.cc:173</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a117ba5528a92b0cf4752d15d3692e158"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">shaka::media::Demuxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00232">demuxer.cc:232</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_af89c3d15b452d45bcacea9470ba43a7f"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">shaka::media::Demuxer::streams</a></div><div class="ttdeci">const std::vector&lt; MediaStream * &gt; &amp; streams()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00068">demuxer.h:68</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_abfcf3a9a3f64c0e27497c72324049a1e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(std::unique_ptr&lt; KeySource &gt; key_source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00052">demuxer.cc:52</a></div></div>
+<div class="line"><a name="l00068"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">   68</a></span>&#160;  <span class="keyword">const</span> std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt;&amp; <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a>() {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">return</span> streams_;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  }</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno"><a class="line" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">   74</a></span>&#160;  MediaContainerName <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">container_name</a>() { <span class="keywordflow">return</span> container_name_; }</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keyword">struct </span>QueuedSample {</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    QueuedSample(uint32_t track_id, scoped_refptr&lt;MediaSample&gt; sample);</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    ~QueuedSample();</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    uint32_t track_id;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    scoped_refptr&lt;MediaSample&gt; sample;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  };</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <span class="comment">// Parser init event.</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordtype">void</span> ParserInitEvent(<span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;&amp; <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">streams</a>);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <span class="comment">// Parser new sample event handler. Queues the samples if init event has not</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="comment">// been received, otherwise calls PushSample() to push the sample to</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="comment">// corresponding stream.</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="keywordtype">bool</span> NewSampleEvent(uint32_t track_id,</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;                      <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample);</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="comment">// Helper function to push the sample to corresponding stream.</span></div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="keywordtype">bool</span> PushSample(uint32_t track_id, <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; sample);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  std::string file_name_;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  File* media_file_;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordtype">bool</span> init_event_received_;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  Status init_parsing_status_;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="comment">// Queued samples received in NewSampleEvent() before ParserInitEvent().</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  std::deque&lt;QueuedSample&gt; queued_samples_;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  std::unique_ptr&lt;MediaParser&gt; parser_;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  std::vector&lt;std::unique_ptr&lt;MediaStream&gt;&gt; streams_;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  MediaContainerName container_name_;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; buffer_;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  std::unique_ptr&lt;KeySource&gt; key_source_;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">bool</span> cancelled_;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">Demuxer</a>);</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;};</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;<span class="preprocessor">#endif  // MEDIA_BASE_DEMUXER_H_</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a385c93fd8d589b7d3bccd35e14c58290"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a385c93fd8d589b7d3bccd35e14c58290">shaka::media::Demuxer::container_name</a></div><div class="ttdeci">MediaContainerName container_name()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00074">demuxer.h:74</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a9e0b4a430603fdf4639c2153622ae1a2"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">shaka::media::Demuxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00167">demuxer.cc:167</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a117ba5528a92b0cf4752d15d3692e158"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a117ba5528a92b0cf4752d15d3692e158">shaka::media::Demuxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00222">demuxer.cc:222</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_abfcf3a9a3f64c0e27497c72324049a1e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(std::unique_ptr&lt; KeySource &gt; key_source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00050">demuxer.cc:50</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_aafb74f83b0de2c787336bad9f096ce50"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">shaka::media::Demuxer::streams</a></div><div class="ttdeci">const std::vector&lt; std::unique_ptr&lt; MediaStream &gt; &gt; &amp; streams()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00068">demuxer.h:68</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Demuxer_html"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">shaka::media::Demuxer</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dc1/demuxer_8h_source.html#l00032">demuxer.h:32</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00207">demuxer.cc:207</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a436ed9fd2a3ddd78056ec7cf656fd9ad"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">shaka::media::Demuxer::Initialize</a></div><div class="ttdeci">Status Initialize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00056">demuxer.cc:56</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_ae2fee69f99e5815de4f686b24393402e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">shaka::media::Demuxer::Demuxer</a></div><div class="ttdeci">Demuxer(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00037">demuxer.cc:37</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a0f9b7c954ff48c3021467300d755ac29"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a0f9b7c954ff48c3021467300d755ac29">shaka::media::Demuxer::Parse</a></div><div class="ttdeci">Status Parse()</div><div class="ttdoc">Read from the source and send it to the parser. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00197">demuxer.cc:197</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_a436ed9fd2a3ddd78056ec7cf656fd9ad"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">shaka::media::Demuxer::Initialize</a></div><div class="ttdeci">Status Initialize()</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00054">demuxer.cc:54</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Demuxer_html_ae2fee69f99e5815de4f686b24393402e"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">shaka::media::Demuxer::Demuxer</a></div><div class="ttdeci">Demuxer(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/dbe/demuxer_8cc_source.html#l00036">demuxer.cc:36</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1Status_html"><div class="ttname"><a href="../../d0/d93/classshaka_1_1media_1_1Status.html">shaka::media::Status</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d13/status_8h_source.html#l00075">status.h:75</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html b/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html
index 420a842f75..0fff9d152a 100644
--- a/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html
+++ b/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html
@@ -139,7 +139,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>a pointer to the PPS with the given ID, or NULL if none exists. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00630">630</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00624">624</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -158,7 +158,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>a pointer to the SPS with the given ID, or NULL if none exists. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00634">634</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00628">628</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -187,7 +187,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Parses a PPS element. This object is owned and managed by this class. The unique ID of the parsed PPS is stored in |*pps_id| if kOk is returned. </p>
 
-<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00404">404</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00400">400</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -216,7 +216,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Parses a video slice header. If this returns kOk, then |*slice_header| will contain the parsed header; if it returns something else, the contents of |*slice_header| are undefined. </p>
 
-<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00187">187</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00183">183</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -245,7 +245,7 @@ Public Member Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Parses a SPS element. This object is owned and managed by this class. The unique ID of the parsed SPS is stored in |*sps_id| if kOk is returned. </p>
 
-<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00513">513</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../db/dde/h265__parser_8cc_source.html#l00508">508</a> of file <a class="el" href="../../db/dde/h265__parser_8cc_source.html">h265_parser.cc</a>.</p>
 
 </div>
 </div>
@@ -256,7 +256,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dc9/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample-members.html b/docs/de/dc9/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample-members.html
index 9abf6ee290..00cabb0dd8 100644
--- a/docs/de/dc9/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample-members.html
+++ b/docs/de/dc9/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dcb/ts__segmenter_8h_source.html b/docs/de/dcb/ts__segmenter_8h_source.html
index f99f1dbdd6..039c15b375 100644
--- a/docs/de/dcb/ts__segmenter_8h_source.html
+++ b/docs/de/dcb/ts__segmenter_8h_source.html
@@ -211,7 +211,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dcc/mock__mpd__notifier_8cc_source.html b/docs/de/dcc/mock__mpd__notifier_8cc_source.html
index 4b87825450..87cf1d352b 100644
--- a/docs/de/dcc/mock__mpd__notifier_8cc_source.html
+++ b/docs/de/dcc/mock__mpd__notifier_8cc_source.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dcf/file__closer_8h_source.html b/docs/de/dcf/file__closer_8h_source.html
index 0658843e08..b6aaff4b6d 100644
--- a/docs/de/dcf/file__closer_8h_source.html
+++ b/docs/de/dcf/file__closer_8h_source.html
@@ -125,7 +125,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dd6/content__protection__element_8h_source.html b/docs/de/dd6/content__protection__element_8h_source.html
index c5a9773ef8..37fb879f5d 100644
--- a/docs/de/dd6/content__protection__element_8h_source.html
+++ b/docs/de/dd6/content__protection__element_8h_source.html
@@ -142,7 +142,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dd6/muxer__listener__test__helper_8cc_source.html b/docs/de/dd6/muxer__listener__test__helper_8cc_source.html
index c4f258851a..9ea95ba2aa 100644
--- a/docs/de/dd6/muxer__listener__test__helper_8cc_source.html
+++ b/docs/de/dd6/muxer__listener__test__helper_8cc_source.html
@@ -209,7 +209,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html b/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html
index 549070ad8a..47f4effe81 100644
--- a/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html
+++ b/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html b/docs/de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html
index b9cd3ba9f9..e13c988232 100644
--- a/docs/de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html
+++ b/docs/de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html
@@ -256,7 +256,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/ddf/structshaka_1_1media_1_1mp4_1_1MediaData-members.html b/docs/de/ddf/structshaka_1_1media_1_1mp4_1_1MediaData-members.html
index 72117d1956..7f1c00a503 100644
--- a/docs/de/ddf/structshaka_1_1media_1_1mp4_1_1MediaData-members.html
+++ b/docs/de/ddf/structshaka_1_1media_1_1mp4_1_1MediaData-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html b/docs/de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html
index 2207b39404..d16a10375d 100644
--- a/docs/de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html
+++ b/docs/de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html
@@ -333,7 +333,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/de0/classshaka_1_1media_1_1mp4_1_1MP4Muxer-members.html b/docs/de/de0/classshaka_1_1media_1_1mp4_1_1MP4Muxer-members.html
index 225204cded..f2bf147ea2 100644
--- a/docs/de/de0/classshaka_1_1media_1_1mp4_1_1MP4Muxer-members.html
+++ b/docs/de/de0/classshaka_1_1media_1_1mp4_1_1MP4Muxer-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/de4/structshaka_1_1media_1_1H264Pps.html b/docs/de/de4/structshaka_1_1media_1_1H264Pps.html
index 66c9576582..eee778a396 100644
--- a/docs/de/de4/structshaka_1_1media_1_1H264Pps.html
+++ b/docs/de/de4/structshaka_1_1media_1_1H264Pps.html
@@ -159,7 +159,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>second_chroma_qp_index
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00091">91</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00092">92</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following files:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 <li>media/codecs/<a class="el" href="../../dc/d7b/h264__parser_8cc_source.html">h264_parser.cc</a></li>
@@ -167,7 +167,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>second_chroma_qp_index
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html b/docs/de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html
index ad346b9b05..4426fdcd1c 100644
--- a/docs/de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html
+++ b/docs/de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html
@@ -216,7 +216,7 @@ static const size_t&#160;</td><td class="memItemRight" valign="bottom"><b>kUnitS
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/def/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample.html b/docs/de/def/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample.html
index 2e0babe9dd..62d1e61101 100644
--- a/docs/de/def/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample.html
+++ b/docs/de/def/structshaka_1_1media_1_1mp4_1_1DecodingTimeToSample.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html b/docs/de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html
index df1d7df0f9..b0a80f2497 100644
--- a/docs/de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html
+++ b/docs/de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html
@@ -412,7 +412,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_keyframe</b> () co
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html b/docs/de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html
index 3b058fdcda..27a672cfff 100644
--- a/docs/de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html
+++ b/docs/de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html
@@ -215,7 +215,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dfa/muxer__listener_8h_source.html b/docs/de/dfa/muxer__listener_8h_source.html
index 7dbde93dbd..8a16bf3199 100644
--- a/docs/de/dfa/muxer__listener_8h_source.html
+++ b/docs/de/dfa/muxer__listener_8h_source.html
@@ -173,7 +173,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dfa/structshaka_1_1media_1_1mp4_1_1OpusSpecific.html b/docs/de/dfa/structshaka_1_1media_1_1mp4_1_1OpusSpecific.html
index 0d11d14f6d..0a1e36c967 100644
--- a/docs/de/dfa/structshaka_1_1media_1_1mp4_1_1OpusSpecific.html
+++ b/docs/de/dfa/structshaka_1_1media_1_1mp4_1_1OpusSpecific.html
@@ -176,7 +176,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/de/dfd/stream__info_8cc_source.html b/docs/de/dfd/stream__info_8cc_source.html
index f1d6c88aac..64326b27ed 100644
--- a/docs/de/dfd/stream__info_8cc_source.html
+++ b/docs/de/dfd/stream__info_8cc_source.html
@@ -140,7 +140,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d05/vp__codec__configuration__record_8cc_source.html b/docs/df/d05/vp__codec__configuration__record_8cc_source.html
index fb284a30f2..6c8fc9ddd0 100644
--- a/docs/df/d05/vp__codec__configuration__record_8cc_source.html
+++ b/docs/df/d05/vp__codec__configuration__record_8cc_source.html
@@ -360,7 +360,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d1a/offset__byte__queue_8cc_source.html b/docs/df/d1a/offset__byte__queue_8cc_source.html
index fd436445fa..11893093ec 100644
--- a/docs/df/d1a/offset__byte__queue_8cc_source.html
+++ b/docs/df/d1a/offset__byte__queue_8cc_source.html
@@ -164,7 +164,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d1c/classshaka_1_1media_1_1MediaSample-members.html b/docs/df/d1c/classshaka_1_1media_1_1MediaSample-members.html
index 036a5e183c..1236754ef6 100644
--- a/docs/df/d1c/classshaka_1_1media_1_1MediaSample-members.html
+++ b/docs/df/d1c/classshaka_1_1media_1_1MediaSample-members.html
@@ -123,7 +123,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d1c/composition__offset__iterator_8h_source.html b/docs/df/d1c/composition__offset__iterator_8h_source.html
index a4f4b1cc6a..20c22a9b16 100644
--- a/docs/df/d1c/composition__offset__iterator_8h_source.html
+++ b/docs/df/d1c/composition__offset__iterator_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d21/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser-members.html b/docs/df/d21/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser-members.html
index bde5d33957..867e7a057a 100644
--- a/docs/df/d21/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser-members.html
+++ b/docs/df/d21/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser-members.html
@@ -105,7 +105,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d22/validate__flag_8h_source.html b/docs/df/d22/validate__flag_8h_source.html
index 0f2cc28a85..cf3ca3c182 100644
--- a/docs/df/d22/validate__flag_8h_source.html
+++ b/docs/df/d22/validate__flag_8h_source.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d2a/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator-members.html b/docs/df/d2a/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator-members.html
index 9b208e5652..82834651c7 100644
--- a/docs/df/d2a/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator-members.html
+++ b/docs/df/d2a/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html b/docs/df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html
index ad7a205dd6..d0b1b30f16 100644
--- a/docs/df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html
+++ b/docs/df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html
@@ -279,7 +279,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d31/muxer__util_8cc_source.html b/docs/df/d31/muxer__util_8cc_source.html
index 8e5f36a009..631a2809c7 100644
--- a/docs/df/d31/muxer__util_8cc_source.html
+++ b/docs/df/d31/muxer__util_8cc_source.html
@@ -264,7 +264,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d32/audio__stream__info_8h_source.html b/docs/df/d32/audio__stream__info_8h_source.html
index 838688fb07..1a83fb7c0c 100644
--- a/docs/df/d32/audio__stream__info_8h_source.html
+++ b/docs/df/d32/audio__stream__info_8h_source.html
@@ -164,7 +164,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d33/classshaka_1_1AdaptationSet-members.html b/docs/df/d33/classshaka_1_1AdaptationSet-members.html
index ea39e2a670..761285620d 100644
--- a/docs/df/d33/classshaka_1_1AdaptationSet-members.html
+++ b/docs/df/d33/classshaka_1_1AdaptationSet-members.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d38/structshaka_1_1media_1_1mp4_1_1ChunkInfo.html b/docs/df/d38/structshaka_1_1media_1_1mp4_1_1ChunkInfo.html
index f0adddc7db..51cb6ead8f 100644
--- a/docs/df/d38/structshaka_1_1media_1_1mp4_1_1ChunkInfo.html
+++ b/docs/df/d38/structshaka_1_1media_1_1mp4_1_1ChunkInfo.html
@@ -115,7 +115,7 @@ uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>sample_descriptio
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d38/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader-members.html b/docs/df/d38/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader-members.html
index da7eccd15e..01f919c3da 100644
--- a/docs/df/d38/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader-members.html
+++ b/docs/df/d38/structshaka_1_1media_1_1mp4_1_1MovieExtendsHeader-members.html
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html b/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html
index e393e8ea2e..3983eee9da 100644
--- a/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html
+++ b/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html
@@ -180,7 +180,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d46/classshaka_1_1media_1_1Muxer.html b/docs/df/d46/classshaka_1_1media_1_1Muxer.html
index 142334763a..8a6af19ec8 100644
--- a/docs/df/d46/classshaka_1_1media_1_1Muxer.html
+++ b/docs/df/d46/classshaka_1_1media_1_1Muxer.html
@@ -342,7 +342,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MediaStream</b></td>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html b/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html
index e96993ee33..48089a4f5a 100644
--- a/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html
+++ b/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d50/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter-members.html b/docs/df/d50/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter-members.html
index c40524e08c..5b114a7ddc 100644
--- a/docs/df/d50/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter-members.html
+++ b/docs/df/d50/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter-members.html
@@ -104,7 +104,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:06 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d51/classshaka_1_1media_1_1RsaPrivateKey-members.html b/docs/df/d51/classshaka_1_1media_1_1RsaPrivateKey-members.html
index 754cc84655..e975f65396 100644
--- a/docs/df/d51/classshaka_1_1media_1_1RsaPrivateKey-members.html
+++ b/docs/df/d51/classshaka_1_1media_1_1RsaPrivateKey-members.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d51/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter-members.html b/docs/df/d51/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter-members.html
index 8511c27216..c941a9ef39 100644
--- a/docs/df/d51/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter-members.html
+++ b/docs/df/d51/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter-members.html
@@ -122,7 +122,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d60/classshaka_1_1MockMpdBuilder.html b/docs/df/d60/classshaka_1_1MockMpdBuilder.html
index 92942c8b93..e7e192a4e5 100644
--- a/docs/df/d60/classshaka_1_1MockMpdBuilder.html
+++ b/docs/df/d60/classshaka_1_1MockMpdBuilder.html
@@ -153,7 +153,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d63/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry-members.html b/docs/df/d63/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry-members.html
index ed48d09d63..861f175329 100644
--- a/docs/df/d63/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry-members.html
+++ b/docs/df/d63/structshaka_1_1media_1_1mp4_1_1AudioRollRecoveryEntry-members.html
@@ -101,7 +101,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d66/classshaka_1_1media_1_1KeyFetcher.html b/docs/df/d66/classshaka_1_1media_1_1KeyFetcher.html
index e55bbf0775..834593a3df 100644
--- a/docs/df/d66/classshaka_1_1media_1_1KeyFetcher.html
+++ b/docs/df/d66/classshaka_1_1media_1_1KeyFetcher.html
@@ -177,7 +177,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html b/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html
index 9b17726f01..7f140935bd 100644
--- a/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html
+++ b/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d6a/structshaka_1_1media_1_1mp4_1_1OpusSpecific-members.html b/docs/df/d6a/structshaka_1_1media_1_1mp4_1_1OpusSpecific-members.html
index a63ce6860b..90c063fbcd 100644
--- a/docs/df/d6a/structshaka_1_1media_1_1mp4_1_1OpusSpecific-members.html
+++ b/docs/df/d6a/structshaka_1_1media_1_1mp4_1_1OpusSpecific-members.html
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:15 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html b/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html
index 44b048ad7b..357d730c33 100644
--- a/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html
+++ b/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html b/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html
index b32a14562b..5ebc002503 100644
--- a/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html
+++ b/docs/df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html
@@ -198,7 +198,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d7d/webm__info__parser_8cc_source.html b/docs/df/d7d/webm__info__parser_8cc_source.html
index fa93634b0e..a64567fd64 100644
--- a/docs/df/d7d/webm__info__parser_8cc_source.html
+++ b/docs/df/d7d/webm__info__parser_8cc_source.html
@@ -200,7 +200,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d82/classshaka_1_1media_1_1DecoderConfigurationRecord-members.html b/docs/df/d82/classshaka_1_1media_1_1DecoderConfigurationRecord-members.html
index 2bb9324ea1..d210c07aca 100644
--- a/docs/df/d82/classshaka_1_1media_1_1DecoderConfigurationRecord-members.html
+++ b/docs/df/d82/classshaka_1_1media_1_1DecoderConfigurationRecord-members.html
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html b/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html
index bed5de5bc3..12c23f15d9 100644
--- a/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html
+++ b/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html
@@ -192,7 +192,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00032">32</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00031">31</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
 
 </div>
 </div>
@@ -285,7 +285,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00109">109</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00107">107</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
 
 </div>
 </div>
@@ -369,7 +369,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 <p>Set IV. </p>
 <dl class="section return"><dt>Returns</dt><dd>true if successful, false if the input is invalid. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00069">69</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00067">67</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
 
 </div>
 </div>
@@ -387,7 +387,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><div class="memdoc">
 <p>Update IV for next sample. As recommended in ISO/IEC 23001-7: IV need to be updated per sample for CENC. This is used by encryptors only. It is a NOP if using kUseConstantIv. </p>
 
-<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00080">80</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html#l00078">78</a> of file <a class="el" href="../../d6/d55/aes__cryptor_8cc_source.html">aes_cryptor.cc</a>.</p>
 
 </div>
 </div>
@@ -424,7 +424,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d8a/structshaka_1_1media_1_1mp4_1_1DataEntryUrl.html b/docs/df/d8a/structshaka_1_1media_1_1mp4_1_1DataEntryUrl.html
index d293707bb5..8b870ac21a 100644
--- a/docs/df/d8a/structshaka_1_1media_1_1mp4_1_1DataEntryUrl.html
+++ b/docs/df/d8a/structshaka_1_1media_1_1mp4_1_1DataEntryUrl.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d8a/vp9__parser_8h_source.html b/docs/df/d8a/vp9__parser_8h_source.html
index 387529705a..9f39d73da2 100644
--- a/docs/df/d8a/vp9__parser_8h_source.html
+++ b/docs/df/d8a/vp9__parser_8h_source.html
@@ -136,7 +136,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d8a/vpx__parser_8h_source.html b/docs/df/d8a/vpx__parser_8h_source.html
index beab3d395f..c33746727d 100644
--- a/docs/df/d8a/vpx__parser_8h_source.html
+++ b/docs/df/d8a/vpx__parser_8h_source.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d8c/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter-members.html b/docs/df/d8c/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter-members.html
index cfc799c37a..cad54912b0 100644
--- a/docs/df/d8c/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter-members.html
+++ b/docs/df/d8c/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter-members.html
@@ -118,7 +118,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d8d/es__parser__h26x_8h_source.html b/docs/df/d8d/es__parser__h26x_8h_source.html
index bce267f259..45d43b4387 100644
--- a/docs/df/d8d/es__parser__h26x_8h_source.html
+++ b/docs/df/d8d/es__parser__h26x_8h_source.html
@@ -235,7 +235,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html b/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html
index 1fef701eb4..1a1d56b11a 100644
--- a/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html
+++ b/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html
@@ -103,7 +103,7 @@ Public Member Functions</h2></td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00406">406</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/da3/mpd__builder_8h_source.html#l00403">403</a> of file <a class="el" href="../../d6/da3/mpd__builder_8h_source.html">mpd_builder.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a2fc3088977c82cab3bac96be10c7c117"></a>
 <div class="memitem">
@@ -195,7 +195,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d96/xml__node_8cc_source.html b/docs/df/d96/xml__node_8cc_source.html
index 0867868df8..4a66890f1c 100644
--- a/docs/df/d96/xml__node_8cc_source.html
+++ b/docs/df/d96/xml__node_8cc_source.html
@@ -100,395 +100,394 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;</div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/macros.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/stl_util.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_number_conversions.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/sys_byteorder.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/segment_info.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">namespace </span>shaka {</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">using</span> xml::XmlNode;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">typedef</span> MediaInfo::AudioInfo AudioInfo;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">typedef</span> MediaInfo::VideoInfo VideoInfo;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">namespace </span>{</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kEC3Codec[] = <span class="stringliteral">&quot;ec-3&quot;</span>;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;std::string RangeToString(<span class="keyword">const</span> Range&amp; range) {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keywordflow">return</span> base::Uint64ToString(range.begin()) + <span class="stringliteral">&quot;-&quot;</span> +</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;         base::Uint64ToString(range.end());</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;}</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keywordtype">bool</span> PopulateSegmentTimeline(<span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                             XmlNode* segment_timeline) {</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;SegmentInfo&gt;::const_iterator it = segment_infos.begin();</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;       it != segment_infos.end();</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;       ++it) {</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    XmlNode s_element(<span class="stringliteral">&quot;S&quot;</span>);</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    s_element.SetIntegerAttribute(<span class="stringliteral">&quot;t&quot;</span>, it-&gt;start_time);</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    s_element.SetIntegerAttribute(<span class="stringliteral">&quot;d&quot;</span>, it-&gt;duration);</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keywordflow">if</span> (it-&gt;repeat &gt; 0)</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      s_element.SetIntegerAttribute(<span class="stringliteral">&quot;r&quot;</span>, it-&gt;repeat);</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    CHECK(segment_timeline-&gt;AddChild(s_element.PassScopedPtr()));</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  }</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;}</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}  <span class="comment">// namespace</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keyword">namespace </span>xml {</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
-<div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">   55</a></span>&#160;<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode::XmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name) : node_(xmlNewNode(NULL, BAD_CAST name)) {</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  DCHECK(name);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;}</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;XmlNode::~XmlNode() {}</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00062"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">   62</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">XmlNode::AddChild</a>(scoped_xml_ptr&lt;xmlNode&gt; child) {</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  DCHECK(child);</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordflow">if</span> (!xmlAddChild(node_.get(), child.get()))</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="comment">// Reaching here means the ownership of |child| transfered to |node_|.</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="comment">// Release the pointer so that it doesn&#39;t get destructed in this scope.</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  ignore_result(child.release());</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;}</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">   74</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">XmlNode::AddElements</a>(<span class="keyword">const</span> std::vector&lt;Element&gt;&amp; elements) {</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> element_index = 0; element_index &lt; elements.size();</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;       ++element_index) {</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../de/da9/structshaka_1_1Element.html">Element</a>&amp; child_element = elements[element_index];</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> child_node(child_element.name.c_str());</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    <span class="keywordflow">for</span> (std::map&lt;std::string, std::string&gt;::const_iterator attribute_it =</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;             child_element.attributes.begin();</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;         attribute_it != child_element.attributes.end(); ++attribute_it) {</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      child_node.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(attribute_it-&gt;first.c_str(),</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;                                    attribute_it-&gt;second);</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    }</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="comment">// Recursively set children for the child.</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordflow">if</span> (!child_node.AddElements(child_element.subelements))</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    child_node.SetContent(child_element.content);</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="keywordflow">if</span> (!xmlAddChild(node_.get(), child_node.GetRawPtr())) {</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to set child &quot;</span> &lt;&lt; child_element.name</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; to parent element &quot;</span></div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;                 &lt;&lt; <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span><span class="keywordtype">char</span>*<span class="keyword">&gt;</span>(node_-&gt;name);</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    }</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    <span class="comment">// Reaching here means the ownership of |child_node| transfered to |node_|.</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    <span class="comment">// Release the pointer so that it doesn&#39;t get destructed in this scope.</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    ignore_result(child_node.Release());</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  }</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;}</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;</div>
-<div class="line"><a name="l00104"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">  104</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">XmlNode::SetStringAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;                                 <span class="keyword">const</span> std::string&amp; attribute) {</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  DCHECK(attribute_name);</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  xmlSetProp(node_.get(), BAD_CAST attribute_name, BAD_CAST attribute.c_str());</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;}</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;</div>
-<div class="line"><a name="l00111"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">  111</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">XmlNode::SetIntegerAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, uint64_t number) {</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  DCHECK(attribute_name);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  xmlSetProp(node_.get(),</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;             BAD_CAST attribute_name,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;             BAD_CAST (base::Uint64ToString(number).c_str()));</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;}</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div>
-<div class="line"><a name="l00119"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">  119</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">XmlNode::SetFloatingPointAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;                                        <span class="keywordtype">double</span> number) {</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  DCHECK(attribute_name);</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  xmlSetProp(node_.get(),</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;             BAD_CAST attribute_name,</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;             BAD_CAST (base::DoubleToString(number).c_str()));</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;}</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;</div>
-<div class="line"><a name="l00128"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">  128</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">XmlNode::SetId</a>(uint32_t <span class="keywordtype">id</span>) {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;id&quot;</span>, <span class="keywordtype">id</span>);</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;}</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;</div>
-<div class="line"><a name="l00132"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">  132</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">XmlNode::SetContent</a>(<span class="keyword">const</span> std::string&amp; content) {</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  xmlNodeSetContent(node_.get(), BAD_CAST content.c_str());</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;}</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;</div>
-<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">  137</a></span>&#160;scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">XmlNode::PassScopedPtr</a>() {</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Passing node_.&quot;</span>;</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordflow">return</span> std::move(node_);</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;}</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;</div>
-<div class="line"><a name="l00143"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">  143</a></span>&#160;xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">XmlNode::Release</a>() {</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Releasing node_.&quot;</span>;</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  DCHECK(node_);</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  <span class="keywordflow">return</span> node_.release();</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;}</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;</div>
-<div class="line"><a name="l00149"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">  149</a></span>&#160;xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">XmlNode::GetRawPtr</a>() {</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="keywordflow">return</span> node_.get();</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;}</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;RepresentationBaseXmlNode::RepresentationBaseXmlNode(<span class="keyword">const</span> <span class="keywordtype">char</span>* name)</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    : <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a>(name) {}</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;RepresentationBaseXmlNode::~RepresentationBaseXmlNode() {}</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;<span class="keywordtype">bool</span> RepresentationBaseXmlNode::AddContentProtectionElements(</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keyword">const</span> std::list&lt;ContentProtectionElement&gt;&amp; content_protection_elements) {</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  std::list&lt;ContentProtectionElement&gt;::const_iterator content_protection_it =</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      content_protection_elements.begin();</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordflow">for</span> (; content_protection_it != content_protection_elements.end();</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;       ++content_protection_it) {</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;    <span class="keywordflow">if</span> (!AddContentProtectionElement(*content_protection_it))</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  }</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;}</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;<span class="keywordtype">bool</span> RepresentationBaseXmlNode::AddContentProtectionElement(</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    <span class="keyword">const</span> ContentProtectionElement&amp; content_protection_element) {</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a> content_protection_node(<span class="stringliteral">&quot;ContentProtection&quot;</span>);</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="comment">// @value is an optional attribute.</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="keywordflow">if</span> (!content_protection_element.value.empty()) {</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    content_protection_node.SetStringAttribute(</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;        <span class="stringliteral">&quot;value&quot;</span>, content_protection_element.value);</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  }</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  content_protection_node.SetStringAttribute(</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;      <span class="stringliteral">&quot;schemeIdUri&quot;</span>, content_protection_element.scheme_id_uri);</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keyword">typedef</span> std::map&lt;std::string, std::string&gt; AttributesMapType;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keyword">const</span> AttributesMapType&amp; additional_attributes =</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;      content_protection_element.additional_attributes;</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  AttributesMapType::const_iterator attributes_it =</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;      additional_attributes.begin();</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;  <span class="keywordflow">for</span> (; attributes_it != additional_attributes.end(); ++attributes_it) {</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    content_protection_node.SetStringAttribute(attributes_it-&gt;first.c_str(),</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;                                               attributes_it-&gt;second);</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  }</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">if</span> (!content_protection_node.AddElements(</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;          content_protection_element.subelements)) {</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  }</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(content_protection_node.PassScopedPtr());</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;}</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;AdaptationSetXmlNode::AdaptationSetXmlNode()</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    : RepresentationBaseXmlNode(<span class="stringliteral">&quot;AdaptationSet&quot;</span>) {}</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;AdaptationSetXmlNode::~AdaptationSetXmlNode() {}</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;</div>
-<div class="line"><a name="l00204"></a><span class="lineno"><a class="line" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">  204</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">AdaptationSetXmlNode::AddRoleElement</a>(<span class="keyword">const</span> std::string&amp; scheme_id_uri,</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;                                          <span class="keyword">const</span> std::string&amp; value) {</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> role(<span class="stringliteral">&quot;Role&quot;</span>);</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;schemeIdUri&quot;</span>, scheme_id_uri);</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;value&quot;</span>, value);</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>());</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;}</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;RepresentationXmlNode::RepresentationXmlNode()</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    : <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>(<span class="stringliteral">&quot;Representation&quot;</span>) {}</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;RepresentationXmlNode::~RepresentationXmlNode() {}</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;</div>
-<div class="line"><a name="l00216"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">  216</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">RepresentationXmlNode::AddVideoInfo</a>(<span class="keyword">const</span> VideoInfo&amp; video_info,</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;                                         <span class="keywordtype">bool</span> set_width,</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;                                         <span class="keywordtype">bool</span> set_height,</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;                                         <span class="keywordtype">bool</span> set_frame_rate) {</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordflow">if</span> (!video_info.has_width() || !video_info.has_height()) {</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing width or height for adding a video info.&quot;</span>;</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  }</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;  <span class="keywordflow">if</span> (video_info.has_pixel_width() &amp;&amp; video_info.has_pixel_height()) {</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;sar&quot;</span>, base::IntToString(video_info.pixel_width()) +</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;                                  <span class="stringliteral">&quot;:&quot;</span> +</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;                                  base::IntToString(video_info.pixel_height()));</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;  }</div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;  <span class="keywordflow">if</span> (set_width)</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;width&quot;</span>, video_info.width());</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keywordflow">if</span> (set_height)</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;height&quot;</span>, video_info.height());</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">if</span> (set_frame_rate) {</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;frameRate&quot;</span>,</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;                       base::IntToString(video_info.time_scale()) + <span class="stringliteral">&quot;/&quot;</span> +</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;                           base::IntToString(video_info.frame_duration()));</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  }</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;}</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;</div>
-<div class="line"><a name="l00243"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">  243</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">RepresentationXmlNode::AddAudioInfo</a>(<span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;  <span class="keywordflow">if</span> (!AddAudioChannelInfo(audio_info))</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  AddAudioSamplingRateInfo(audio_info);</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;}</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;</div>
-<div class="line"><a name="l00251"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">  251</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">RepresentationXmlNode::AddVODOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  <span class="keywordflow">if</span> (media_info.has_media_file_name()) {</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> base_url(<span class="stringliteral">&quot;BaseURL&quot;</span>);</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;    base_url.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">SetContent</a>(media_info.media_file_name());</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(base_url.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  }</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> need_segment_base = media_info.has_index_range() ||</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;                                 media_info.has_init_range() ||</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;                                 media_info.has_reference_time_scale();</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;  <span class="keywordflow">if</span> (need_segment_base) {</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_base(<span class="stringliteral">&quot;SegmentBase&quot;</span>);</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;    <span class="keywordflow">if</span> (media_info.has_index_range()) {</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;indexRange&quot;</span>,</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;                                      RangeToString(media_info.index_range()));</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;    }</div>
-<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;</div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;    <span class="keywordflow">if</span> (media_info.has_reference_time_scale()) {</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;      segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;timescale&quot;</span>,</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;                                       media_info.reference_time_scale());</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;    }</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;    <span class="keywordflow">if</span> (media_info.has_init_range()) {</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;      <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> initialization(<span class="stringliteral">&quot;Initialization&quot;</span>);</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;      initialization.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;range&quot;</span>,</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;                                        RangeToString(media_info.init_range()));</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;      <span class="keywordflow">if</span> (!segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(initialization.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;    }</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  }</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <span class="keywordflow">if</span> (media_info.has_media_duration_seconds()) {</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;    <span class="comment">// Adding &#39;duration&#39; attribute, so that this information can be used when</span></div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;    <span class="comment">// generating one MPD file. This should be removed from the final MPD.</span></div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">SetFloatingPointAttribute</a>(<span class="stringliteral">&quot;duration&quot;</span>, media_info.media_duration_seconds());</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  }</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;}</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;</div>
-<div class="line"><a name="l00298"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">  298</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">RepresentationXmlNode::AddLiveOnlyInfo</a>(</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;    <span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    uint32_t start_number) {</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_template(<span class="stringliteral">&quot;SegmentTemplate&quot;</span>);</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  <span class="keywordflow">if</span> (media_info.has_reference_time_scale()) {</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;timescale&quot;</span>,</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;                                         media_info.reference_time_scale());</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  }</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  <span class="keywordflow">if</span> (media_info.has_init_segment_name()) {</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    <span class="comment">// The spec does not allow &#39;$Number$&#39; and &#39;$Time$&#39; in initialization</span></div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;    <span class="comment">// attribute.</span></div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    <span class="comment">// TODO(rkuroiwa, kqyang): Swap this check out with a better check. These</span></div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    <span class="comment">// templates allow formatting as well.</span></div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    <span class="keyword">const</span> std::string&amp; init_segment_name = media_info.init_segment_name();</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;    <span class="keywordflow">if</span> (init_segment_name.find(<span class="stringliteral">&quot;$Number$&quot;</span>) != std::string::npos ||</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;        init_segment_name.find(<span class="stringliteral">&quot;$Time$&quot;</span>) != std::string::npos) {</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;$Number$ and $Time$ cannot be used for &quot;</span></div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;                    <span class="stringliteral">&quot;SegmentTemplate@initialization&quot;</span>;</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;    }</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;initialization&quot;</span>,</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;                                        media_info.init_segment_name());</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;  }</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;  <span class="keywordflow">if</span> (media_info.has_segment_template()) {</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;media&quot;</span>, media_info.segment_template());</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;    <span class="comment">// TODO(rkuroiwa): Need a better check. $$Number is legitimate but not a</span></div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;    <span class="comment">// template.</span></div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;    <span class="keywordflow">if</span> (media_info.segment_template().find(<span class="stringliteral">&quot;$Number&quot;</span>) != std::string::npos) {</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;      DCHECK_GE(start_number, 1u);</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;      segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;startNumber&quot;</span>, start_number);</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;    }</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  }</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  <span class="comment">// TODO(rkuroiwa): Find out when a live MPD doesn&#39;t require SegmentTimeline.</span></div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_timeline(<span class="stringliteral">&quot;SegmentTimeline&quot;</span>);</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;  <span class="keywordflow">return</span> PopulateSegmentTimeline(segment_infos, &amp;segment_timeline) &amp;&amp;</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;         segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_timeline.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()) &amp;&amp;</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;         <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>());</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;}</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;<span class="keywordtype">bool</span> RepresentationXmlNode::AddAudioChannelInfo(<span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  std::string audio_channel_config_scheme;</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  std::string audio_channel_config_value;</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  <span class="keywordflow">if</span> (audio_info.codec() == kEC3Codec) {</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="comment">// Convert EC3 channel map into string of hexadecimal digits. Spec: DASH-IF</span></div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;    <span class="comment">// Interoperability Points v3.0 9.2.1.2.</span></div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;    <span class="keyword">const</span> uint16_t ec3_channel_map =</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;        base::HostToNet16(audio_info.codec_specific_data().ec3_channel_map());</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;    audio_channel_config_value =</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;        base::HexEncode(&amp;ec3_channel_map, <span class="keyword">sizeof</span>(ec3_channel_map));</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;    audio_channel_config_scheme =</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;        <span class="stringliteral">&quot;tag:dolby.com,2014:dash:audio_channel_configuration:2011&quot;</span>;</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    audio_channel_config_value = base::UintToString(audio_info.num_channels());</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;    audio_channel_config_scheme =</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;        <span class="stringliteral">&quot;urn:mpeg:dash:23003:3:audio_channel_configuration:2011&quot;</span>;</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  }</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a> audio_channel_config(<span class="stringliteral">&quot;AudioChannelConfiguration&quot;</span>);</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;  audio_channel_config.SetStringAttribute(<span class="stringliteral">&quot;schemeIdUri&quot;</span>,</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;                                          audio_channel_config_scheme);</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;  audio_channel_config.SetStringAttribute(<span class="stringliteral">&quot;value&quot;</span>, audio_channel_config_value);</div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(audio_channel_config.PassScopedPtr());</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;}</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;<span class="comment">// MPD expects one number for sampling frequency, or if it is a range it should</span></div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;<span class="comment">// be space separated.</span></div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;<span class="keywordtype">void</span> RepresentationXmlNode::AddAudioSamplingRateInfo(</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;    <span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;  <span class="keywordflow">if</span> (audio_info.has_sampling_frequency())</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;audioSamplingRate&quot;</span>, audio_info.sampling_frequency());</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;}</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;}  <span class="comment">// namespace xml</span></div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_aeb5b425a0d9fe472e13e508ee431307a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">shaka::xml::RepresentationXmlNode::AddVideoInfo</a></div><div class="ttdeci">bool AddVideoInfo(const MediaInfo::VideoInfo &amp;video_info, bool set_width, bool set_height, bool set_frame_rate)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00216">xml_node.cc:216</a></div></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_number_conversions.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/sys_byteorder.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/segment_info.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">namespace </span>shaka {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">using</span> xml::XmlNode;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">typedef</span> MediaInfo::AudioInfo AudioInfo;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">typedef</span> MediaInfo::VideoInfo VideoInfo;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span>{</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span> kEC3Codec[] = <span class="stringliteral">&quot;ec-3&quot;</span>;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;std::string RangeToString(<span class="keyword">const</span> Range&amp; range) {</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keywordflow">return</span> base::Uint64ToString(range.begin()) + <span class="stringliteral">&quot;-&quot;</span> +</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;         base::Uint64ToString(range.end());</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;}</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keywordtype">bool</span> PopulateSegmentTimeline(<span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                             XmlNode* segment_timeline) {</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordflow">for</span> (std::list&lt;SegmentInfo&gt;::const_iterator it = segment_infos.begin();</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;       it != segment_infos.end();</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;       ++it) {</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    XmlNode s_element(<span class="stringliteral">&quot;S&quot;</span>);</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    s_element.SetIntegerAttribute(<span class="stringliteral">&quot;t&quot;</span>, it-&gt;start_time);</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    s_element.SetIntegerAttribute(<span class="stringliteral">&quot;d&quot;</span>, it-&gt;duration);</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="keywordflow">if</span> (it-&gt;repeat &gt; 0)</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      s_element.SetIntegerAttribute(<span class="stringliteral">&quot;r&quot;</span>, it-&gt;repeat);</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    CHECK(segment_timeline-&gt;AddChild(s_element.PassScopedPtr()));</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  }</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;}</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;}  <span class="comment">// namespace</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="keyword">namespace </span>xml {</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00054"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">   54</a></span>&#160;<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode::XmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name) : node_(xmlNewNode(NULL, BAD_CAST name)) {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  DCHECK(name);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;}</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;XmlNode::~XmlNode() {}</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div>
+<div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">   61</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">XmlNode::AddChild</a>(scoped_xml_ptr&lt;xmlNode&gt; child) {</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  DCHECK(child);</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordflow">if</span> (!xmlAddChild(node_.get(), child.get()))</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="comment">// Reaching here means the ownership of |child| transfered to |node_|.</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="comment">// Release the pointer so that it doesn&#39;t get destructed in this scope.</span></div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  ignore_result(child.release());</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;}</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">   73</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">XmlNode::AddElements</a>(<span class="keyword">const</span> std::vector&lt;Element&gt;&amp; elements) {</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> element_index = 0; element_index &lt; elements.size();</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;       ++element_index) {</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="keyword">const</span> <a class="code" href="../../de/da9/structshaka_1_1Element.html">Element</a>&amp; child_element = elements[element_index];</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> child_node(child_element.name.c_str());</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">for</span> (std::map&lt;std::string, std::string&gt;::const_iterator attribute_it =</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;             child_element.attributes.begin();</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;         attribute_it != child_element.attributes.end(); ++attribute_it) {</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      child_node.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(attribute_it-&gt;first.c_str(),</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;                                    attribute_it-&gt;second);</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    }</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="comment">// Recursively set children for the child.</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="keywordflow">if</span> (!child_node.AddElements(child_element.subelements))</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    child_node.SetContent(child_element.content);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">if</span> (!xmlAddChild(node_.get(), child_node.GetRawPtr())) {</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to set child &quot;</span> &lt;&lt; child_element.name</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot; to parent element &quot;</span></div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;                 &lt;&lt; <span class="keyword">reinterpret_cast&lt;</span><span class="keyword">const </span><span class="keywordtype">char</span>*<span class="keyword">&gt;</span>(node_-&gt;name);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    }</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="comment">// Reaching here means the ownership of |child_node| transfered to |node_|.</span></div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    <span class="comment">// Release the pointer so that it doesn&#39;t get destructed in this scope.</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    ignore_result(child_node.Release());</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  }</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;}</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;</div>
+<div class="line"><a name="l00103"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">  103</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">XmlNode::SetStringAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;                                 <span class="keyword">const</span> std::string&amp; attribute) {</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  DCHECK(attribute_name);</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  xmlSetProp(node_.get(), BAD_CAST attribute_name, BAD_CAST attribute.c_str());</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;}</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;</div>
+<div class="line"><a name="l00110"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">  110</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">XmlNode::SetIntegerAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, uint64_t number) {</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  DCHECK(attribute_name);</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  xmlSetProp(node_.get(),</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;             BAD_CAST attribute_name,</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;             BAD_CAST (base::Uint64ToString(number).c_str()));</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;}</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
+<div class="line"><a name="l00118"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">  118</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">XmlNode::SetFloatingPointAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;                                        <span class="keywordtype">double</span> number) {</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  DCHECK(attribute_name);</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  xmlSetProp(node_.get(),</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;             BAD_CAST attribute_name,</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;             BAD_CAST (base::DoubleToString(number).c_str()));</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;}</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
+<div class="line"><a name="l00127"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">  127</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">XmlNode::SetId</a>(uint32_t <span class="keywordtype">id</span>) {</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;id&quot;</span>, <span class="keywordtype">id</span>);</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;}</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;</div>
+<div class="line"><a name="l00131"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">  131</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">XmlNode::SetContent</a>(<span class="keyword">const</span> std::string&amp; content) {</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  xmlNodeSetContent(node_.get(), BAD_CAST content.c_str());</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;}</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;</div>
+<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">  136</a></span>&#160;scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">XmlNode::PassScopedPtr</a>() {</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Passing node_.&quot;</span>;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="keywordflow">return</span> std::move(node_);</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;}</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;</div>
+<div class="line"><a name="l00142"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">  142</a></span>&#160;xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">XmlNode::Release</a>() {</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  DVLOG(2) &lt;&lt; <span class="stringliteral">&quot;Releasing node_.&quot;</span>;</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  DCHECK(node_);</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <span class="keywordflow">return</span> node_.release();</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;}</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;</div>
+<div class="line"><a name="l00148"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">  148</a></span>&#160;xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">XmlNode::GetRawPtr</a>() {</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="keywordflow">return</span> node_.get();</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;}</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;RepresentationBaseXmlNode::RepresentationBaseXmlNode(<span class="keyword">const</span> <span class="keywordtype">char</span>* name)</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;    : <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a>(name) {}</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;RepresentationBaseXmlNode::~RepresentationBaseXmlNode() {}</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;<span class="keywordtype">bool</span> RepresentationBaseXmlNode::AddContentProtectionElements(</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    <span class="keyword">const</span> std::list&lt;ContentProtectionElement&gt;&amp; content_protection_elements) {</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  std::list&lt;ContentProtectionElement&gt;::const_iterator content_protection_it =</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;      content_protection_elements.begin();</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordflow">for</span> (; content_protection_it != content_protection_elements.end();</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;       ++content_protection_it) {</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keywordflow">if</span> (!AddContentProtectionElement(*content_protection_it))</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  }</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;}</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;<span class="keywordtype">bool</span> RepresentationBaseXmlNode::AddContentProtectionElement(</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <span class="keyword">const</span> ContentProtectionElement&amp; content_protection_element) {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a> content_protection_node(<span class="stringliteral">&quot;ContentProtection&quot;</span>);</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="comment">// @value is an optional attribute.</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordflow">if</span> (!content_protection_element.value.empty()) {</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    content_protection_node.SetStringAttribute(</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;        <span class="stringliteral">&quot;value&quot;</span>, content_protection_element.value);</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  }</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  content_protection_node.SetStringAttribute(</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;      <span class="stringliteral">&quot;schemeIdUri&quot;</span>, content_protection_element.scheme_id_uri);</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <span class="keyword">typedef</span> std::map&lt;std::string, std::string&gt; AttributesMapType;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keyword">const</span> AttributesMapType&amp; additional_attributes =</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;      content_protection_element.additional_attributes;</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  AttributesMapType::const_iterator attributes_it =</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;      additional_attributes.begin();</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keywordflow">for</span> (; attributes_it != additional_attributes.end(); ++attributes_it) {</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;    content_protection_node.SetStringAttribute(attributes_it-&gt;first.c_str(),</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;                                               attributes_it-&gt;second);</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  }</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="keywordflow">if</span> (!content_protection_node.AddElements(</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;          content_protection_element.subelements)) {</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  }</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(content_protection_node.PassScopedPtr());</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;}</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;AdaptationSetXmlNode::AdaptationSetXmlNode()</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    : RepresentationBaseXmlNode(<span class="stringliteral">&quot;AdaptationSet&quot;</span>) {}</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;AdaptationSetXmlNode::~AdaptationSetXmlNode() {}</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;</div>
+<div class="line"><a name="l00203"></a><span class="lineno"><a class="line" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">  203</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">AdaptationSetXmlNode::AddRoleElement</a>(<span class="keyword">const</span> std::string&amp; scheme_id_uri,</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;                                          <span class="keyword">const</span> std::string&amp; value) {</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> role(<span class="stringliteral">&quot;Role&quot;</span>);</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;schemeIdUri&quot;</span>, scheme_id_uri);</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;value&quot;</span>, value);</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(role.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>());</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;}</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;RepresentationXmlNode::RepresentationXmlNode()</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    : <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>(<span class="stringliteral">&quot;Representation&quot;</span>) {}</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;RepresentationXmlNode::~RepresentationXmlNode() {}</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;</div>
+<div class="line"><a name="l00215"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">  215</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">RepresentationXmlNode::AddVideoInfo</a>(<span class="keyword">const</span> VideoInfo&amp; video_info,</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;                                         <span class="keywordtype">bool</span> set_width,</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;                                         <span class="keywordtype">bool</span> set_height,</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;                                         <span class="keywordtype">bool</span> set_frame_rate) {</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  <span class="keywordflow">if</span> (!video_info.has_width() || !video_info.has_height()) {</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Missing width or height for adding a video info.&quot;</span>;</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  }</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;  <span class="keywordflow">if</span> (video_info.has_pixel_width() &amp;&amp; video_info.has_pixel_height()) {</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;sar&quot;</span>, base::IntToString(video_info.pixel_width()) +</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;                                  <span class="stringliteral">&quot;:&quot;</span> +</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;                                  base::IntToString(video_info.pixel_height()));</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  }</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;  <span class="keywordflow">if</span> (set_width)</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;width&quot;</span>, video_info.width());</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;  <span class="keywordflow">if</span> (set_height)</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;height&quot;</span>, video_info.height());</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  <span class="keywordflow">if</span> (set_frame_rate) {</div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;frameRate&quot;</span>,</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;                       base::IntToString(video_info.time_scale()) + <span class="stringliteral">&quot;/&quot;</span> +</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;                           base::IntToString(video_info.frame_duration()));</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  }</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;}</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;</div>
+<div class="line"><a name="l00242"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">  242</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">RepresentationXmlNode::AddAudioInfo</a>(<span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;  <span class="keywordflow">if</span> (!AddAudioChannelInfo(audio_info))</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  AddAudioSamplingRateInfo(audio_info);</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;}</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;</div>
+<div class="line"><a name="l00250"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">  250</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">RepresentationXmlNode::AddVODOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info) {</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  <span class="keywordflow">if</span> (media_info.has_media_file_name()) {</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> base_url(<span class="stringliteral">&quot;BaseURL&quot;</span>);</div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;    base_url.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">SetContent</a>(media_info.media_file_name());</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(base_url.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  }</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> need_segment_base = media_info.has_index_range() ||</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;                                 media_info.has_init_range() ||</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;                                 media_info.has_reference_time_scale();</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;  <span class="keywordflow">if</span> (need_segment_base) {</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_base(<span class="stringliteral">&quot;SegmentBase&quot;</span>);</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    <span class="keywordflow">if</span> (media_info.has_index_range()) {</div>
+<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;      segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;indexRange&quot;</span>,</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;                                      RangeToString(media_info.index_range()));</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    }</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;    <span class="keywordflow">if</span> (media_info.has_reference_time_scale()) {</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;      segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;timescale&quot;</span>,</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;                                       media_info.reference_time_scale());</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;    }</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;    <span class="keywordflow">if</span> (media_info.has_init_range()) {</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;      <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> initialization(<span class="stringliteral">&quot;Initialization&quot;</span>);</div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;      initialization.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;range&quot;</span>,</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;                                        RangeToString(media_info.init_range()));</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;      <span class="keywordflow">if</span> (!segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(initialization.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;    }</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_base.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()))</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  }</div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;  <span class="keywordflow">if</span> (media_info.has_media_duration_seconds()) {</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;    <span class="comment">// Adding &#39;duration&#39; attribute, so that this information can be used when</span></div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;    <span class="comment">// generating one MPD file. This should be removed from the final MPD.</span></div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">SetFloatingPointAttribute</a>(<span class="stringliteral">&quot;duration&quot;</span>, media_info.media_duration_seconds());</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  }</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;}</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;</div>
+<div class="line"><a name="l00297"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">  297</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">RepresentationXmlNode::AddLiveOnlyInfo</a>(</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    <span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    <span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;    uint32_t start_number) {</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_template(<span class="stringliteral">&quot;SegmentTemplate&quot;</span>);</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <span class="keywordflow">if</span> (media_info.has_reference_time_scale()) {</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;timescale&quot;</span>,</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;                                         media_info.reference_time_scale());</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  }</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;  <span class="keywordflow">if</span> (media_info.has_init_segment_name()) {</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;    <span class="comment">// The spec does not allow &#39;$Number$&#39; and &#39;$Time$&#39; in initialization</span></div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;    <span class="comment">// attribute.</span></div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;    <span class="comment">// TODO(rkuroiwa, kqyang): Swap this check out with a better check. These</span></div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    <span class="comment">// templates allow formatting as well.</span></div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    <span class="keyword">const</span> std::string&amp; init_segment_name = media_info.init_segment_name();</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    <span class="keywordflow">if</span> (init_segment_name.find(<span class="stringliteral">&quot;$Number$&quot;</span>) != std::string::npos ||</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;        init_segment_name.find(<span class="stringliteral">&quot;$Time$&quot;</span>) != std::string::npos) {</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;$Number$ and $Time$ cannot be used for &quot;</span></div>
+<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;                    <span class="stringliteral">&quot;SegmentTemplate@initialization&quot;</span>;</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;    }</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;initialization&quot;</span>,</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                                        media_info.init_segment_name());</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  }</div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;</div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  <span class="keywordflow">if</span> (media_info.has_segment_template()) {</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;    segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="stringliteral">&quot;media&quot;</span>, media_info.segment_template());</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;    <span class="comment">// TODO(rkuroiwa): Need a better check. $$Number is legitimate but not a</span></div>
+<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;    <span class="comment">// template.</span></div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;    <span class="keywordflow">if</span> (media_info.segment_template().find(<span class="stringliteral">&quot;$Number&quot;</span>) != std::string::npos) {</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;      DCHECK_GE(start_number, 1u);</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;      segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;startNumber&quot;</span>, start_number);</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;    }</div>
+<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;  }</div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  <span class="comment">// TODO(rkuroiwa): Find out when a live MPD doesn&#39;t require SegmentTimeline.</span></div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> segment_timeline(<span class="stringliteral">&quot;SegmentTimeline&quot;</span>);</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;  <span class="keywordflow">return</span> PopulateSegmentTimeline(segment_infos, &amp;segment_timeline) &amp;&amp;</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;         segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_timeline.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>()) &amp;&amp;</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;         <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(segment_template.<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>());</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;}</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;<span class="keywordtype">bool</span> RepresentationXmlNode::AddAudioChannelInfo(<span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;  std::string audio_channel_config_scheme;</div>
+<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  std::string audio_channel_config_value;</div>
+<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keywordflow">if</span> (audio_info.codec() == kEC3Codec) {</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;    <span class="comment">// Convert EC3 channel map into string of hexadecimal digits. Spec: DASH-IF</span></div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="comment">// Interoperability Points v3.0 9.2.1.2.</span></div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;    <span class="keyword">const</span> uint16_t ec3_channel_map =</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;        base::HostToNet16(audio_info.codec_specific_data().ec3_channel_map());</div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;    audio_channel_config_value =</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;        base::HexEncode(&amp;ec3_channel_map, <span class="keyword">sizeof</span>(ec3_channel_map));</div>
+<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;    audio_channel_config_scheme =</div>
+<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;        <span class="stringliteral">&quot;tag:dolby.com,2014:dash:audio_channel_configuration:2011&quot;</span>;</div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    audio_channel_config_value = base::UintToString(audio_info.num_channels());</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    audio_channel_config_scheme =</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;        <span class="stringliteral">&quot;urn:mpeg:dash:23003:3:audio_channel_configuration:2011&quot;</span>;</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;  }</div>
+<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;  <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a> audio_channel_config(<span class="stringliteral">&quot;AudioChannelConfiguration&quot;</span>);</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  audio_channel_config.SetStringAttribute(<span class="stringliteral">&quot;schemeIdUri&quot;</span>,</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;                                          audio_channel_config_scheme);</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;  audio_channel_config.SetStringAttribute(<span class="stringliteral">&quot;value&quot;</span>, audio_channel_config_value);</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(audio_channel_config.PassScopedPtr());</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;}</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;<span class="comment">// MPD expects one number for sampling frequency, or if it is a range it should</span></div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;<span class="comment">// be space separated.</span></div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;<span class="keywordtype">void</span> RepresentationXmlNode::AddAudioSamplingRateInfo(</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;    <span class="keyword">const</span> AudioInfo&amp; audio_info) {</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;  <span class="keywordflow">if</span> (audio_info.has_sampling_frequency())</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;    <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="stringliteral">&quot;audioSamplingRate&quot;</span>, audio_info.sampling_frequency());</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;}</div>
+<div class="line"><a name="l00376"></a><span class="lineno">  376</span>&#160;</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;}  <span class="comment">// namespace xml</span></div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_aeb5b425a0d9fe472e13e508ee431307a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">shaka::xml::RepresentationXmlNode::AddVideoInfo</a></div><div class="ttdeci">bool AddVideoInfo(const MediaInfo::VideoInfo &amp;video_info, bool set_width, bool set_height, bool set_frame_rate)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00215">xml_node.cc:215</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1RepresentationBaseXmlNode_html"><div class="ttname"><a href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">shaka::xml::RepresentationBaseXmlNode</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00097">xml_node.h:97</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ac4b6c261b14ffe83e9820b76b16af1ba"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">shaka::xml::XmlNode::SetFloatingPointAttribute</a></div><div class="ttdeci">void SetFloatingPointAttribute(const char *attribute_name, double number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00119">xml_node.cc:119</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ac4b6c261b14ffe83e9820b76b16af1ba"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">shaka::xml::XmlNode::SetFloatingPointAttribute</a></div><div class="ttdeci">void SetFloatingPointAttribute(const char *attribute_name, double number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00118">xml_node.cc:118</a></div></div>
 <div class="ttc" id="structshaka_1_1Element_html"><div class="ttname"><a href="../../de/da9/structshaka_1_1Element.html">shaka::Element</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dd6/content__protection__element_8h_source.html#l00022">content_protection_element.h:22</a></div></div>
 <div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">shaka::xml::XmlNode</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/de7/xml__node_8h_source.html#l00032">xml_node.h:32</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a0be0a3e9b041978e118d994c1f13e8fb"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">shaka::xml::XmlNode::PassScopedPtr</a></div><div class="ttdeci">scoped_xml_ptr&lt; xmlNode &gt; PassScopedPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00137">xml_node.cc:137</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a52ffb838d25293eafbea9f05fb1c2d17"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">shaka::xml::XmlNode::XmlNode</a></div><div class="ttdeci">XmlNode(const char *name)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00055">xml_node.cc:55</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a68a51ea870f2a24379a9b81cb97b6ac0"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">shaka::xml::RepresentationXmlNode::AddVODOnlyInfo</a></div><div class="ttdeci">bool AddVODOnlyInfo(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00251">xml_node.cc:251</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_afc83f9dbaedc8ba0fc9cc1153ac23329"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">shaka::xml::XmlNode::SetStringAttribute</a></div><div class="ttdeci">void SetStringAttribute(const char *attribute_name, const std::string &amp;attribute)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00104">xml_node.cc:104</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a5f8deed2a9bb707c40db24374b3b7fbd"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">shaka::xml::XmlNode::AddChild</a></div><div class="ttdeci">bool AddChild(scoped_xml_ptr&lt; xmlNode &gt; child)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00062">xml_node.cc:62</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ae5cb2c3000ccbd53c0a1867db0b8a2d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">shaka::xml::XmlNode::Release</a></div><div class="ttdeci">xmlNodePtr Release()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00143">xml_node.cc:143</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_ae9ff190e1a653a348b00b5edd9d6cc60"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">shaka::xml::RepresentationXmlNode::AddLiveOnlyInfo</a></div><div class="ttdeci">bool AddLiveOnlyInfo(const MediaInfo &amp;media_info, const std::list&lt; SegmentInfo &gt; &amp;segment_infos, uint32_t start_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00298">xml_node.cc:298</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a7479055041708fb681957a838e7ecc1f"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">shaka::xml::XmlNode::SetId</a></div><div class="ttdeci">void SetId(uint32_t id)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00128">xml_node.cc:128</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a31d77d822a66991f48b67bfad3fa86d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">shaka::xml::XmlNode::AddElements</a></div><div class="ttdeci">bool AddElements(const std::vector&lt; Element &gt; &amp;elements)</div><div class="ttdoc">Adds Elements to this node using the Element struct. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00074">xml_node.cc:74</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ab15dbcc1a051218dc16f44584276ad20"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">shaka::xml::XmlNode::SetIntegerAttribute</a></div><div class="ttdeci">void SetIntegerAttribute(const char *attribute_name, uint64_t number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00111">xml_node.cc:111</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1AdaptationSetXmlNode_html_a2718eede55bb89447a74ff802b95fdb1"><div class="ttname"><a href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">shaka::xml::AdaptationSetXmlNode::AddRoleElement</a></div><div class="ttdeci">void AddRoleElement(const std::string &amp;scheme_id_uri, const std::string &amp;value)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00204">xml_node.cc:204</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a73d758186470e7dbcb4f4339eb53458c"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode::SetContent</a></div><div class="ttdeci">void SetContent(const std::string &amp;content)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00132">xml_node.cc:132</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a49050cf0e7883bfa6e8e2fb0174b2a7a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">shaka::xml::RepresentationXmlNode::AddAudioInfo</a></div><div class="ttdeci">bool AddAudioInfo(const MediaInfo::AudioInfo &amp;audio_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00243">xml_node.cc:243</a></div></div>
-<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_aac9765712087dcc47a0afef4bf7849ff"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">shaka::xml::XmlNode::GetRawPtr</a></div><div class="ttdeci">xmlNodePtr GetRawPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00149">xml_node.cc:149</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a0be0a3e9b041978e118d994c1f13e8fb"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">shaka::xml::XmlNode::PassScopedPtr</a></div><div class="ttdeci">scoped_xml_ptr&lt; xmlNode &gt; PassScopedPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00136">xml_node.cc:136</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a52ffb838d25293eafbea9f05fb1c2d17"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">shaka::xml::XmlNode::XmlNode</a></div><div class="ttdeci">XmlNode(const char *name)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00054">xml_node.cc:54</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a68a51ea870f2a24379a9b81cb97b6ac0"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">shaka::xml::RepresentationXmlNode::AddVODOnlyInfo</a></div><div class="ttdeci">bool AddVODOnlyInfo(const MediaInfo &amp;media_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00250">xml_node.cc:250</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_afc83f9dbaedc8ba0fc9cc1153ac23329"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">shaka::xml::XmlNode::SetStringAttribute</a></div><div class="ttdeci">void SetStringAttribute(const char *attribute_name, const std::string &amp;attribute)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00103">xml_node.cc:103</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a5f8deed2a9bb707c40db24374b3b7fbd"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">shaka::xml::XmlNode::AddChild</a></div><div class="ttdeci">bool AddChild(scoped_xml_ptr&lt; xmlNode &gt; child)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00061">xml_node.cc:61</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ae5cb2c3000ccbd53c0a1867db0b8a2d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">shaka::xml::XmlNode::Release</a></div><div class="ttdeci">xmlNodePtr Release()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00142">xml_node.cc:142</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_ae9ff190e1a653a348b00b5edd9d6cc60"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">shaka::xml::RepresentationXmlNode::AddLiveOnlyInfo</a></div><div class="ttdeci">bool AddLiveOnlyInfo(const MediaInfo &amp;media_info, const std::list&lt; SegmentInfo &gt; &amp;segment_infos, uint32_t start_number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00297">xml_node.cc:297</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a7479055041708fb681957a838e7ecc1f"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">shaka::xml::XmlNode::SetId</a></div><div class="ttdeci">void SetId(uint32_t id)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00127">xml_node.cc:127</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a31d77d822a66991f48b67bfad3fa86d0"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">shaka::xml::XmlNode::AddElements</a></div><div class="ttdeci">bool AddElements(const std::vector&lt; Element &gt; &amp;elements)</div><div class="ttdoc">Adds Elements to this node using the Element struct. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00073">xml_node.cc:73</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_ab15dbcc1a051218dc16f44584276ad20"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">shaka::xml::XmlNode::SetIntegerAttribute</a></div><div class="ttdeci">void SetIntegerAttribute(const char *attribute_name, uint64_t number)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00110">xml_node.cc:110</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1AdaptationSetXmlNode_html_a2718eede55bb89447a74ff802b95fdb1"><div class="ttname"><a href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">shaka::xml::AdaptationSetXmlNode::AddRoleElement</a></div><div class="ttdeci">void AddRoleElement(const std::string &amp;scheme_id_uri, const std::string &amp;value)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00203">xml_node.cc:203</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_a73d758186470e7dbcb4f4339eb53458c"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode::SetContent</a></div><div class="ttdeci">void SetContent(const std::string &amp;content)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00131">xml_node.cc:131</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1RepresentationXmlNode_html_a49050cf0e7883bfa6e8e2fb0174b2a7a"><div class="ttname"><a href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">shaka::xml::RepresentationXmlNode::AddAudioInfo</a></div><div class="ttdeci">bool AddAudioInfo(const MediaInfo::AudioInfo &amp;audio_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00242">xml_node.cc:242</a></div></div>
+<div class="ttc" id="classshaka_1_1xml_1_1XmlNode_html_aac9765712087dcc47a0afef4bf7849ff"><div class="ttname"><a href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">shaka::xml::XmlNode::GetRawPtr</a></div><div class="ttdeci">xmlNodePtr GetRawPtr()</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d96/xml__node_8cc_source.html#l00148">xml_node.cc:148</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d9a/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime.html b/docs/df/d9a/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime.html
index 262b2d17eb..a0b41f1d56 100644
--- a/docs/df/d9a/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime.html
+++ b/docs/df/d9a/structshaka_1_1media_1_1mp4_1_1TrackFragmentDecodeTime.html
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html b/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html
index f1f295ac49..b5c8a9e7bf 100644
--- a/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html
+++ b/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html
@@ -183,7 +183,7 @@ Additional Inherited Members</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successfully set attributes and children elements (if applicable), false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00243">243</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00242">242</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -223,7 +223,7 @@ Additional Inherited Members</h2></td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00298">298</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00297">297</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -274,7 +274,7 @@ Additional Inherited Members</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successfully set attributes and children elements (if applicable), false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00216">216</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00215">215</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -300,7 +300,7 @@ Additional Inherited Members</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00251">251</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../df/d96/xml__node_8cc_source.html#l00250">250</a> of file <a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a>.</p>
 
 </div>
 </div>
@@ -311,7 +311,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/da0/structshaka_1_1media_1_1mp4_1_1ChunkOffset-members.html b/docs/df/da0/structshaka_1_1media_1_1mp4_1_1ChunkOffset-members.html
index 12d82576ca..3d1d923fed 100644
--- a/docs/df/da0/structshaka_1_1media_1_1mp4_1_1ChunkOffset-members.html
+++ b/docs/df/da0/structshaka_1_1media_1_1mp4_1_1ChunkOffset-members.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:07 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/da5/structshaka_1_1media_1_1mp4_1_1CueIDBox-members.html b/docs/df/da5/structshaka_1_1media_1_1mp4_1_1CueIDBox-members.html
index 995e830fbf..70bb383a60 100644
--- a/docs/df/da5/structshaka_1_1media_1_1mp4_1_1CueIDBox-members.html
+++ b/docs/df/da5/structshaka_1_1media_1_1mp4_1_1CueIDBox-members.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:16 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/dad/decrypt__config_8h_source.html b/docs/df/dad/decrypt__config_8h_source.html
index 9692948ec3..f8b02b2eb7 100644
--- a/docs/df/dad/decrypt__config_8h_source.html
+++ b/docs/df/dad/decrypt__config_8h_source.html
@@ -168,7 +168,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/db8/structshaka_1_1media_1_1StreamDescriptor-members.html b/docs/df/db8/structshaka_1_1media_1_1StreamDescriptor-members.html
index bb5876ba65..7b498b32c4 100644
--- a/docs/df/db8/structshaka_1_1media_1_1StreamDescriptor-members.html
+++ b/docs/df/db8/structshaka_1_1media_1_1StreamDescriptor-members.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/dc7/avc__decoder__configuration__record_8h_source.html b/docs/df/dc7/avc__decoder__configuration__record_8h_source.html
index efa9448fbf..37e505ee79 100644
--- a/docs/df/dc7/avc__decoder__configuration__record_8h_source.html
+++ b/docs/df/dc7/avc__decoder__configuration__record_8h_source.html
@@ -153,7 +153,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/dd2/mpd__utils_8h_source.html b/docs/df/dd2/mpd__utils_8h_source.html
index 526cb05af5..286be9e58d 100644
--- a/docs/df/dd2/mpd__utils_8h_source.html
+++ b/docs/df/dd2/mpd__utils_8h_source.html
@@ -174,7 +174,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/dd2/structshaka_1_1media_1_1H264Pps-members.html b/docs/df/dd2/structshaka_1_1media_1_1H264Pps-members.html
index 57fcdb1fbe..96ae6cb439 100644
--- a/docs/df/dd2/structshaka_1_1media_1_1H264Pps-members.html
+++ b/docs/df/dd2/structshaka_1_1media_1_1H264Pps-members.html
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/ddc/webm_2segmenter_8h_source.html b/docs/df/ddc/webm_2segmenter_8h_source.html
index 56f9c362a0..c066793c82 100644
--- a/docs/df/ddc/webm_2segmenter_8h_source.html
+++ b/docs/df/ddc/webm_2segmenter_8h_source.html
@@ -251,7 +251,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/dde/ts__section__psi_8cc_source.html b/docs/df/dde/ts__section__psi_8cc_source.html
index 4663f99b5a..8bb2bcf0bb 100644
--- a/docs/df/dde/ts__section__psi_8cc_source.html
+++ b/docs/df/dde/ts__section__psi_8cc_source.html
@@ -230,7 +230,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html b/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html
index 4f81d9c253..c18de73ba3 100644
--- a/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html
+++ b/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html
@@ -111,14 +111,14 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>changing_slice_group_i
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00219">219</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d9b/h264__parser_8h_source.html#l00220">220</a> of file <a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>media/codecs/<a class="el" href="../../d6/d9b/h264__parser_8h_source.html">h264_parser.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:14 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:05 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/de3/text__track__config_8cc_source.html b/docs/df/de3/text__track__config_8cc_source.html
index 69a1712f4d..57a7c0c917 100644
--- a/docs/df/de3/text__track__config_8cc_source.html
+++ b/docs/df/de3/text__track__config_8cc_source.html
@@ -122,7 +122,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:12 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:03 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/de9/segment__info_8h_source.html b/docs/df/de9/segment__info_8h_source.html
index 3d0eb8f934..e9c6c6fae0 100644
--- a/docs/df/de9/segment__info_8h_source.html
+++ b/docs/df/de9/segment__info_8h_source.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/df/df1/structshaka_1_1ContentProtectionElement-members.html b/docs/df/df1/structshaka_1_1ContentProtectionElement-members.html
index f3c271486f..25af7241a5 100644
--- a/docs/df/df1/structshaka_1_1ContentProtectionElement-members.html
+++ b/docs/df/df1/structshaka_1_1ContentProtectionElement-members.html
@@ -102,7 +102,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:13 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:04 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_0494b8c96e3190a776d2b97ade9c8ddf.html b/docs/dir_0494b8c96e3190a776d2b97ade9c8ddf.html
index 36a4215fdb..ba8b63cb5f 100644
--- a/docs/dir_0494b8c96e3190a776d2b97ade9c8ddf.html
+++ b/docs/dir_0494b8c96e3190a776d2b97ade9c8ddf.html
@@ -165,7 +165,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_2618cd273dea54f184e42d7a562af818.html b/docs/dir_2618cd273dea54f184e42d7a562af818.html
index 3462295322..ef9a328490 100644
--- a/docs/dir_2618cd273dea54f184e42d7a562af818.html
+++ b/docs/dir_2618cd273dea54f184e42d7a562af818.html
@@ -140,7 +140,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_279fd47bebb21302c25cfb685e84c359.html b/docs/dir_279fd47bebb21302c25cfb685e84c359.html
index be91ce118e..1afd4c1984 100644
--- a/docs/dir_279fd47bebb21302c25cfb685e84c359.html
+++ b/docs/dir_279fd47bebb21302c25cfb685e84c359.html
@@ -119,7 +119,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_2eceb70145328c029a5f43350007537a.html b/docs/dir_2eceb70145328c029a5f43350007537a.html
index c0f638686d..d7603e703e 100644
--- a/docs/dir_2eceb70145328c029a5f43350007537a.html
+++ b/docs/dir_2eceb70145328c029a5f43350007537a.html
@@ -93,7 +93,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_39dc0668bd5a501998f94e8b4e546c71.html b/docs/dir_39dc0668bd5a501998f94e8b4e546c71.html
index d833a925d5..457175abaf 100644
--- a/docs/dir_39dc0668bd5a501998f94e8b4e546c71.html
+++ b/docs/dir_39dc0668bd5a501998f94e8b4e546c71.html
@@ -99,7 +99,7 @@ Directories</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_3e9291fd7a18fdecc763294cb2628910.html b/docs/dir_3e9291fd7a18fdecc763294cb2628910.html
index a451f5ed1f..a33662012e 100644
--- a/docs/dir_3e9291fd7a18fdecc763294cb2628910.html
+++ b/docs/dir_3e9291fd7a18fdecc763294cb2628910.html
@@ -157,7 +157,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_49627ef5ef0630f6cf11dd06344c4cf0.html b/docs/dir_49627ef5ef0630f6cf11dd06344c4cf0.html
index 37e485cd82..fc02cef194 100644
--- a/docs/dir_49627ef5ef0630f6cf11dd06344c4cf0.html
+++ b/docs/dir_49627ef5ef0630f6cf11dd06344c4cf0.html
@@ -93,7 +93,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_5039d854a18988ed1f1dbebc120ffbf7.html b/docs/dir_5039d854a18988ed1f1dbebc120ffbf7.html
index bbab10e32f..ae7d591014 100644
--- a/docs/dir_5039d854a18988ed1f1dbebc120ffbf7.html
+++ b/docs/dir_5039d854a18988ed1f1dbebc120ffbf7.html
@@ -181,7 +181,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_65f7acfa8cf3a5f1edc11faa2428b914.html b/docs/dir_65f7acfa8cf3a5f1edc11faa2428b914.html
index cfa1c38d20..d85af28a60 100644
--- a/docs/dir_65f7acfa8cf3a5f1edc11faa2428b914.html
+++ b/docs/dir_65f7acfa8cf3a5f1edc11faa2428b914.html
@@ -101,7 +101,7 @@ Directories</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_679a6f4e9fa092b388fc986148018f2a.html b/docs/dir_679a6f4e9fa092b388fc986148018f2a.html
index f3bd80eac0..651af2fe78 100644
--- a/docs/dir_679a6f4e9fa092b388fc986148018f2a.html
+++ b/docs/dir_679a6f4e9fa092b388fc986148018f2a.html
@@ -95,7 +95,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_7f5e01ba7faf319a30cabd201b6ef121.html b/docs/dir_7f5e01ba7faf319a30cabd201b6ef121.html
index e7ca0ea8df..745586b619 100644
--- a/docs/dir_7f5e01ba7faf319a30cabd201b6ef121.html
+++ b/docs/dir_7f5e01ba7faf319a30cabd201b6ef121.html
@@ -93,7 +93,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_89dd766eb2df7d7257dbe806a34404af.html b/docs/dir_89dd766eb2df7d7257dbe806a34404af.html
index 24cb75a125..d6ae57e103 100644
--- a/docs/dir_89dd766eb2df7d7257dbe806a34404af.html
+++ b/docs/dir_89dd766eb2df7d7257dbe806a34404af.html
@@ -93,7 +93,7 @@ Directories</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_aa73376d632f252584a1c0dfbefab2c4.html b/docs/dir_aa73376d632f252584a1c0dfbefab2c4.html
index b60157c1dd..f323a56fe1 100644
--- a/docs/dir_aa73376d632f252584a1c0dfbefab2c4.html
+++ b/docs/dir_aa73376d632f252584a1c0dfbefab2c4.html
@@ -117,7 +117,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_c6ada2450b25ab5438a4dba6c9b890af.html b/docs/dir_c6ada2450b25ab5438a4dba6c9b890af.html
index 05cd2544d1..34909bd868 100644
--- a/docs/dir_c6ada2450b25ab5438a4dba6c9b890af.html
+++ b/docs/dir_c6ada2450b25ab5438a4dba6c9b890af.html
@@ -245,7 +245,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_d422163b96683743ed3963d4aac17747.html b/docs/dir_d422163b96683743ed3963d4aac17747.html
index f5cb193470..00830f1175 100644
--- a/docs/dir_d422163b96683743ed3963d4aac17747.html
+++ b/docs/dir_d422163b96683743ed3963d4aac17747.html
@@ -135,7 +135,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_eeaeb49ac3913fcfb450d3ce9cc0141b.html b/docs/dir_eeaeb49ac3913fcfb450d3ce9cc0141b.html
index b5f52e5719..20ed0add89 100644
--- a/docs/dir_eeaeb49ac3913fcfb450d3ce9cc0141b.html
+++ b/docs/dir_eeaeb49ac3913fcfb450d3ce9cc0141b.html
@@ -93,7 +93,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/dir_f7dcbe7025bbacfc4b9a7dff6ad41d72.html b/docs/dir_f7dcbe7025bbacfc4b9a7dff6ad41d72.html
index a3d497e89b..5a42847bf4 100644
--- a/docs/dir_f7dcbe7025bbacfc4b9a7dff6ad41d72.html
+++ b/docs/dir_f7dcbe7025bbacfc4b9a7dff6ad41d72.html
@@ -171,7 +171,7 @@ Files</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/files.html b/docs/files.html
index ccbe1b26a7..a66e4746d0 100644
--- a/docs/files.html
+++ b/docs/files.html
@@ -430,7 +430,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions.html b/docs/functions.html
index 20abae650d..10b1579948 100644
--- a/docs/functions.html
+++ b/docs/functions.html
@@ -240,7 +240,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_b.html b/docs/functions_b.html
index 2833684b89..aa8a016884 100644
--- a/docs/functions_b.html
+++ b/docs/functions_b.html
@@ -240,7 +240,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_c.html b/docs/functions_c.html
index 37bd1f46ad..89df45ce77 100644
--- a/docs/functions_c.html
+++ b/docs/functions_c.html
@@ -241,7 +241,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_d.html b/docs/functions_d.html
index 91fb996094..d02a272fa3 100644
--- a/docs/functions_d.html
+++ b/docs/functions_d.html
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_e.html b/docs/functions_e.html
index db2c7affa1..dc2f72f5e4 100644
--- a/docs/functions_e.html
+++ b/docs/functions_e.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_enum.html b/docs/functions_enum.html
index c2bf40b3af..6c44ac58c1 100644
--- a/docs/functions_enum.html
+++ b/docs/functions_enum.html
@@ -100,7 +100,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_eval.html b/docs/functions_eval.html
index 0b727df69b..a4564aca7d 100644
--- a/docs/functions_eval.html
+++ b/docs/functions_eval.html
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_f.html b/docs/functions_f.html
index bde6504a5d..5fd3ef7ede 100644
--- a/docs/functions_f.html
+++ b/docs/functions_f.html
@@ -193,7 +193,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func.html b/docs/functions_func.html
index f00389acf9..6872c44c45 100644
--- a/docs/functions_func.html
+++ b/docs/functions_func.html
@@ -240,7 +240,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_b.html b/docs/functions_func_b.html
index 49d795d8aa..76320f0e33 100644
--- a/docs/functions_func_b.html
+++ b/docs/functions_func_b.html
@@ -237,7 +237,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html
index 7f9bc3a7f7..fc5bf3be99 100644
--- a/docs/functions_func_c.html
+++ b/docs/functions_func_c.html
@@ -241,7 +241,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html
index 4491f65bfc..af81acf163 100644
--- a/docs/functions_func_d.html
+++ b/docs/functions_func_d.html
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html
index 5b1a580013..55797150de 100644
--- a/docs/functions_func_e.html
+++ b/docs/functions_func_e.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html
index d81a59b4bb..ff9241577a 100644
--- a/docs/functions_func_f.html
+++ b/docs/functions_func_f.html
@@ -187,7 +187,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html
index fd5280d66d..c49a7d8581 100644
--- a/docs/functions_func_g.html
+++ b/docs/functions_func_g.html
@@ -259,7 +259,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html
index fd65714b4d..60617b1cf0 100644
--- a/docs/functions_func_h.html
+++ b/docs/functions_func_h.html
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html
index d3feda2c58..1e8551a68d 100644
--- a/docs/functions_func_i.html
+++ b/docs/functions_func_i.html
@@ -210,7 +210,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_k.html b/docs/functions_func_k.html
index 673d6238f7..9d3f1af031 100644
--- a/docs/functions_func_k.html
+++ b/docs/functions_func_k.html
@@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html
index 361a88048b..ae66d6c176 100644
--- a/docs/functions_func_l.html
+++ b/docs/functions_func_l.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html
index 9ff3881a62..1e6793c9da 100644
--- a/docs/functions_func_m.html
+++ b/docs/functions_func_m.html
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_n.html b/docs/functions_func_n.html
index c94d9e9c2b..10d98bceb1 100644
--- a/docs/functions_func_n.html
+++ b/docs/functions_func_n.html
@@ -172,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html
index 9bc3cdb67a..b8d3a2444f 100644
--- a/docs/functions_func_o.html
+++ b/docs/functions_func_o.html
@@ -193,7 +193,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html
index f014804975..d427afea1a 100644
--- a/docs/functions_func_p.html
+++ b/docs/functions_func_p.html
@@ -228,7 +228,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html
index 4d6a139a1d..e53031425a 100644
--- a/docs/functions_func_r.html
+++ b/docs/functions_func_r.html
@@ -201,7 +201,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html
index 482d446126..eb51d8e5af 100644
--- a/docs/functions_func_s.html
+++ b/docs/functions_func_s.html
@@ -273,7 +273,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#aa023c7fafbced88ca40e98362a7e4c69">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>streams()
-: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">shaka::media::Demuxer</a>
+: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">shaka::media::Demuxer</a>
 </li>
 <li>SuppressOnce()
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation</a>
@@ -285,7 +285,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html
index d91fbe1557..0deff07e5e 100644
--- a/docs/functions_func_t.html
+++ b/docs/functions_func_t.html
@@ -179,7 +179,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html
index 6561dbf7f7..307a4f822f 100644
--- a/docs/functions_func_u.html
+++ b/docs/functions_func_u.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html
index 097d2ad59f..d627521fdd 100644
--- a/docs/functions_func_v.html
+++ b/docs/functions_func_v.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html
index 0fb5dd3a7b..e83a2ff8c5 100644
--- a/docs/functions_func_w.html
+++ b/docs/functions_func_w.html
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_x.html b/docs/functions_func_x.html
index fc71f3ac09..01ce1df713 100644
--- a/docs/functions_func_x.html
+++ b/docs/functions_func_x.html
@@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html
index 35e0ad961c..3be7676232 100644
--- a/docs/functions_func_~.html
+++ b/docs/functions_func_~.html
@@ -132,7 +132,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_g.html b/docs/functions_g.html
index e2a9d8a513..dddd1281d3 100644
--- a/docs/functions_g.html
+++ b/docs/functions_g.html
@@ -259,7 +259,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_h.html b/docs/functions_h.html
index 3c59bd300f..d2524a863f 100644
--- a/docs/functions_h.html
+++ b/docs/functions_h.html
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_i.html b/docs/functions_i.html
index 7157201b1f..fc7a31c162 100644
--- a/docs/functions_i.html
+++ b/docs/functions_i.html
@@ -213,7 +213,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_k.html b/docs/functions_k.html
index e668c1dcb6..c7bd893b68 100644
--- a/docs/functions_k.html
+++ b/docs/functions_k.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_l.html b/docs/functions_l.html
index 72d71f5251..99ab4f3c49 100644
--- a/docs/functions_l.html
+++ b/docs/functions_l.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_m.html b/docs/functions_m.html
index cd5ad5ee59..1efe8b23ea 100644
--- a/docs/functions_m.html
+++ b/docs/functions_m.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_n.html b/docs/functions_n.html
index 9ef0ff63b6..1600475a26 100644
--- a/docs/functions_n.html
+++ b/docs/functions_n.html
@@ -178,7 +178,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_o.html b/docs/functions_o.html
index 6e921d07bb..1509d4796f 100644
--- a/docs/functions_o.html
+++ b/docs/functions_o.html
@@ -196,7 +196,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_p.html b/docs/functions_p.html
index 5bca819b6a..d0d45b1f36 100644
--- a/docs/functions_p.html
+++ b/docs/functions_p.html
@@ -234,7 +234,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_r.html b/docs/functions_r.html
index 169721b611..fdf4b5763b 100644
--- a/docs/functions_r.html
+++ b/docs/functions_r.html
@@ -201,7 +201,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_s.html b/docs/functions_s.html
index 7723279623..878db8a4d0 100644
--- a/docs/functions_s.html
+++ b/docs/functions_s.html
@@ -288,7 +288,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#aa023c7fafbced88ca40e98362a7e4c69">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>streams()
-: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f">shaka::media::Demuxer</a>
+: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50">shaka::media::Demuxer</a>
 </li>
 <li>SuppressOnce()
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">shaka::Representation</a>
@@ -300,7 +300,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_t.html b/docs/functions_t.html
index f68fd6e100..94529da80d 100644
--- a/docs/functions_t.html
+++ b/docs/functions_t.html
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_type.html b/docs/functions_type.html
index e3ee567626..36c711a4ed 100644
--- a/docs/functions_type.html
+++ b/docs/functions_type.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_u.html b/docs/functions_u.html
index 90c0f2f13a..45942e32d6 100644
--- a/docs/functions_u.html
+++ b/docs/functions_u.html
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_v.html b/docs/functions_v.html
index c2370e41b3..82d0276ef8 100644
--- a/docs/functions_v.html
+++ b/docs/functions_v.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_vars.html b/docs/functions_vars.html
index 7d3469e145..e2313433e6 100644
--- a/docs/functions_vars.html
+++ b/docs/functions_vars.html
@@ -145,7 +145,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_w.html b/docs/functions_w.html
index 823d5db791..ff7041fa99 100644
--- a/docs/functions_w.html
+++ b/docs/functions_w.html
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_x.html b/docs/functions_x.html
index 27e1d1d461..22732dd123 100644
--- a/docs/functions_x.html
+++ b/docs/functions_x.html
@@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/functions_~.html b/docs/functions_~.html
index b7fea26ba0..13ca30a9a9 100644
--- a/docs/functions_~.html
+++ b/docs/functions_~.html
@@ -132,7 +132,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/hierarchy.html b/docs/hierarchy.html
index cf9b65d3a5..c54b14de49 100644
--- a/docs/hierarchy.html
+++ b/docs/hierarchy.html
@@ -369,7 +369,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/index.html b/docs/index.html
index 1bc544f54f..5a5cdd6cdd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/namespacemembers.html b/docs/namespacemembers.html
index f2d4a82c22..59b7f2db29 100644
--- a/docs/namespacemembers.html
+++ b/docs/namespacemembers.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/namespacemembers_func.html b/docs/namespacemembers_func.html
index fdac44b844..27c8e2f970 100644
--- a/docs/namespacemembers_func.html
+++ b/docs/namespacemembers_func.html
@@ -124,7 +124,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/namespaces.html b/docs/namespaces.html
index 1c9ead4ac6..ed9018b3aa 100644
--- a/docs/namespaces.html
+++ b/docs/namespaces.html
@@ -92,7 +92,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 31 2016 22:38:17 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 1 2016 17:53:08 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>
diff --git a/docs/search/all_10.js b/docs/search/all_10.js
index 7dda612aaf..dfe659a09b 100644
--- a/docs/search/all_10.js
+++ b/docs/search/all_10.js
@@ -81,7 +81,7 @@ var searchData=
   ['streamdescriptor',['StreamDescriptor',['../d2/d95/structshaka_1_1media_1_1StreamDescriptor.html',1,'shaka::media']]],
   ['streamdescriptorcomparefn',['StreamDescriptorCompareFn',['../d8/d3e/classshaka_1_1media_1_1StreamDescriptorCompareFn.html',1,'shaka::media']]],
   ['streaminfo',['StreamInfo',['../d5/db1/classshaka_1_1media_1_1StreamInfo.html',1,'shaka::media']]],
-  ['streams',['streams',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f',1,'shaka::media::Demuxer']]],
+  ['streams',['streams',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50',1,'shaka::media::Demuxer']]],
   ['subsampleentry',['SubsampleEntry',['../d1/d34/structshaka_1_1media_1_1SubsampleEntry.html',1,'shaka::media']]],
   ['subtitlemediaheader',['SubtitleMediaHeader',['../db/d21/structshaka_1_1media_1_1mp4_1_1SubtitleMediaHeader.html',1,'shaka::media::mp4']]],
   ['suppressonce',['SuppressOnce',['../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed',1,'shaka::Representation']]],
diff --git a/docs/search/functions_10.js b/docs/search/functions_10.js
index 319aa16974..193957856c 100644
--- a/docs/search/functions_10.js
+++ b/docs/search/functions_10.js
@@ -46,7 +46,7 @@ var searchData=
   ['stop',['Stop',['../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html#ac600977b708381facf07f87e36b43d79',1,'shaka::media::ProducerConsumerQueue']]],
   ['stopped',['Stopped',['../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html#a3d88bdebfa412f2847f1d96fd804bba1',1,'shaka::media::ProducerConsumerQueue']]],
   ['stream_5fid',['stream_id',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#aa023c7fafbced88ca40e98362a7e4c69',1,'shaka::media::mp2t::PesPacket']]],
-  ['streams',['streams',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#af89c3d15b452d45bcacea9470ba43a7f',1,'shaka::media::Demuxer']]],
+  ['streams',['streams',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#aafb74f83b0de2c787336bad9f096ce50',1,'shaka::media::Demuxer']]],
   ['suppressonce',['SuppressOnce',['../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed',1,'shaka::Representation']]],
   ['syncsampleiterator',['SyncSampleIterator',['../d7/d26/classshaka_1_1media_1_1mp4_1_1SyncSampleIterator.html#af8bc2d5d153bfdd168f145213c47d3fe',1,'shaka::media::mp4::SyncSampleIterator']]]
 ];