From f5ecf7dad10ae40005de834e4d90738cdd450d46 Mon Sep 17 00:00:00 2001
From: Widevine Buildbot <widevine-device-buildbot@google.com>
Date: Fri, 19 Aug 2016 00:58:26 +0000
Subject: [PATCH] Generate SDK documents for commit
 644629c6167e3d7d364b486345cc3e7be71cc273

---
 docs/annotated.html                           |   2 +-
 docs/classes.html                             |   6 +-
 ...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 |   6 +-
 docs/d0/d35/es__descriptor_8cc_source.html    |   2 +-
 ...s__notify__muxer__listener_8cc_source.html |   6 +-
 docs/d0/d3a/webm__constants_8h_source.html    |   2 +-
 ...mp4_1_1ProtectionSystemSpecificHeader.html |   2 +-
 docs/d0/d42/aes__cryptor_8h_source.html       |  14 +-
 ...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  |  12 +-
 ...a_1_1media_1_1mp2t_1_1TsMuxer-members.html |   6 +-
 ...dia_1_1MpdNotifyMuxerListener-members.html |   2 +-
 ...classshaka_1_1media_1_1ThreadedIoFile.html |   8 +-
 ..._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  |   4 +-
 ...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 |  14 +-
 ...classshaka_1_1media_1_1FixedKeySource.html |  11 +-
 ...webm_1_1MultiSegmentSegmenter-members.html |   6 +-
 ...edia_1_1mp4_1_1VTTEmptyCueBox-members.html |   2 +-
 ..._1xml_1_1AdaptationSetXmlNode-members.html |   2 +-
 .../classshaka_1_1media_1_1RsaPrivateKey.html |   2 +-
 ...aka_1_1media_1_1mp4_1_1CueSettingsBox.html |   2 +-
 ...media_1_1ProtectionSystemSpecificInfo.html |   2 +-
 .../dd6/webm__crypto__helpers_8cc_source.html |   4 +-
 ...lassshaka_1_1media_1_1AesCtrEncryptor.html |   4 +-
 .../dee/segmenter__test__base_8h_source.html  | 147 +--
 docs/d0/df3/packager__util_8cc_source.html    |  60 +-
 ...ia_1_1mp4_1_1AudioSampleEntry-members.html |   2 +-
 .../d0a/classshaka_1_1media_1_1MkvWriter.html |   2 +-
 .../d0a/structshaka_1_1media_1_1H264Sps.html  |   2 +-
 ...der__configuration__record_8cc_source.html |   2 +-
 ...media_1_1mp2t_1_1EsParserH264-members.html |   4 +-
 docs/d1/d13/status_8h_source.html             |   2 +-
 ...single__segment__segmenter_8cc_source.html |  23 +-
 docs/d1/d1d/muxer__flags_8cc_source.html      |   2 +-
 .../d1f/classshaka_1_1media_1_1KeySource.html |   4 +-
 ...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 |  10 +-
 ...media_1_1mp4_1_1DataReference-members.html |   2 +-
 .../structshaka_1_1media_1_1mp4_1_1Box.html   |   2 +-
 .../d2f/webvtt__media__parser_8cc_source.html |   6 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPes.html |  10 +-
 docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html |   4 +-
 ...tructshaka_1_1media_1_1SubsampleEntry.html |   2 +-
 docs/d1/d37/es__parser__h264_8h_source.html   | 105 ++-
 .../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   | 726 ++++++++-------
 ..._1media_1_1H265VideoSliceHeaderParser.html |   2 +-
 .../d7d/webm__video__client_8cc_source.html   |   2 +-
 ...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 |   6 +-
 .../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 |  38 +-
 .../dd5/classshaka_1_1media_1_1Cluster.html   |  10 +-
 ...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     | 171 ++--
 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 |   4 +-
 ...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 |   6 +-
 docs/d2/d24/packager__util_8h_source.html     |  79 +-
 ...media_1_1mp4_1_1KeyRotationFragmenter.html |  12 +-
 docs/d2/d30/tracks__builder_8cc_source.html   |   2 +-
 ...ideo__slice__header__parser_8h_source.html |   2 +-
 ...1_1media_1_1WidevineKeySource-members.html |   6 +-
 ...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               |  14 +-
 .../d4f/structshaka_1_1Element-members.html   |   2 +-
 ...classshaka_1_1MockMpdNotifier-members.html |   2 +-
 ...ructshaka_1_1media_1_1H264SliceHeader.html |   2 +-
 ...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 |   2 +-
 ...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 |  10 +-
 docs/d2/da8/mp4_2segmenter_8cc_source.html    |  22 +-
 ...haka_1_1media_1_1BufferWriter-members.html |   2 +-
 ...assshaka_1_1MockAdaptationSet-members.html |   2 +-
 docs/d2/dae/webm__muxer_8cc_source.html       |   8 +-
 ...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 |  10 +-
 ...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 |  14 +-
 docs/d2/dd6/mkv__writer_8h_source.html        |  10 +-
 ...lassshaka_1_1media_1_1WebMMediaParser.html |   2 +-
 ...haka_1_1media_1_1mp2t_1_1TsSectionPmt.html |   2 +-
 docs/d2/de6/packager__main_8cc_source.html    | 867 +++++++++---------
 ...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 |   4 +-
 .../pes__packet__generator_8cc_source.html    |  24 +-
 ...a_1_1SegmentTestBase_1_1ClusterParser.html |   4 +-
 ...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   |   8 +-
 ...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 |   2 +-
 ...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  |  20 +-
 .../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 |   2 +-
 .../d3/d6b/fixed__key__source_8cc_source.html |  41 +-
 ...lassshaka_1_1media_1_1mp2t_1_1TsMuxer.html |  10 +-
 docs/d3/d72/fixed__key__source_8h_source.html |  22 +-
 ...ssshaka_1_1media_1_1webm_1_1WebMMuxer.html |  10 +-
 .../classshaka_1_1media_1_1AesEncryptor.html  |   4 +-
 ...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   |   4 +-
 .../d3/d8d/webm__audio__client_8h_source.html |  10 +-
 docs/d3/d90/ec3__audio__util_8cc_source.html  |   2 +-
 .../classshaka_1_1media_1_1H264Parser.html    |   2 +-
 docs/d3/da0/ec3__audio__util_8h_source.html   |   2 +-
 ...dia_1_1webm_1_1SingleSegmentSegmenter.html |  18 +-
 ...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           |  12 +-
 ...ructshaka_1_1media_1_1mp4_1_1EditList.html |   2 +-
 ...a_1_1media_1_1mp2t_1_1Mp2tMediaParser.html |  10 +-
 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       |  12 +-
 ...ssshaka_1_1media_1_1AesPatternCryptor.html |  14 +-
 ...2multi__segment__segmenter_8cc_source.html |  12 +-
 ...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 |   4 +-
 ...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 |   2 +-
 .../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 |   2 +-
 .../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 |   4 +-
 ...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   | 164 ++--
 .../db4/classshaka_1_1MpdNotifierFactory.html |   9 +-
 ...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   |  71 +-
 ...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   |   6 +-
 ...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 |   4 +-
 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 |  54 +-
 ...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   | 123 ++-
 ...ampleAuxiliaryInformationSize-members.html |   2 +-
 ...esentationStateChangeListener-members.html |   2 +-
 ...ssshaka_1_1MockRepresentation-members.html |   4 +-
 .../d5c/continuity__counter_8cc_source.html   |   2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH265.html |   8 +-
 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 | 680 +++++++-------
 ..._1_1media_1_1mp4_1_1CompositionOffset.html |   2 +-
 .../d8f/webm__cluster__parser_8cc_source.html |  12 +-
 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         |  16 +-
 ...odec__configuration__record_8h_source.html |   2 +-
 ...H265ReferencePictureListModifications.html |   2 +-
 docs/d5/da4/aes__encryptor_8cc_source.html    |   6 +-
 ...a_1_1media_1_1H265ReferencePictureSet.html |   2 +-
 .../classshaka_1_1media_1_1StreamInfo.html    |   2 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH264.html |  10 +-
 docs/d5/dba/ts__packet_8cc_source.html        |   6 +-
 .../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           |   2 +-
 docs/d5/dda/ts__section__psi_8h_source.html   |   4 +-
 docs/d5/de0/bit__reader_8cc_source.html       |   2 +-
 ..._1media_1_1mp2t_1_1PesPacketGenerator.html |  19 +-
 ...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              | 519 ++++++-----
 ...a_1_1media_1_1AesCbcDecryptor-members.html |   2 +-
 .../d09/aes__pattern__cryptor_8h_source.html  |  97 +-
 .../d6/d16/text__stream__info_8cc_source.html |   2 +-
 docs/d6/d17/es__parser__h264_8cc_source.html  |   4 +-
 ...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   |   8 +-
 ...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    | 658 ++++++-------
 ...2multi__segment__segmenter_8cc_source.html |   6 +-
 docs/d6/d55/aes__cryptor_8cc_source.html      |   2 +-
 ...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  |  16 +-
 docs/d6/d71/scoped__xml__ptr_8h_source.html   |  13 +-
 .../dash__iop__mpd__notifier_8h_source.html   |   8 +-
 ...1media_1_1mp4_1_1VTTAdditionalTextBox.html |   2 +-
 .../d7b/webm__tracks__parser_8h_source.html   | 199 ++--
 ..._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       |   2 +-
 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       |  22 +-
 ...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 |   2 +-
 ..._1_1VideoStreamInfoParameters-members.html |   2 +-
 ...media_1_1mp2t_1_1EsParserH26x-members.html |   4 +-
 docs/d6/dc8/mkv__writer_8cc_source.html       |   4 +-
 ...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 |   2 +-
 ...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     |  32 +-
 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      |  91 +-
 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 |   2 +-
 .../classshaka_1_1media_1_1MediaSample.html   |   4 +-
 ..._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 |   2 +-
 ..._1H265SliceHeader_1_1LongTermPicsInfo.html |   2 +-
 docs/d7/d9d/progress__listener_8h_source.html |   2 +-
 .../da4/track__run__iterator_8h_source.html   |  12 +-
 ...uctshaka_1_1media_1_1mp4_1_1MediaData.html |   2 +-
 docs/d7/db0/mpd__writer_8h_source.html        |  41 +-
 ...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        |  82 +-
 .../d7/dd0/mpd__notifier__util_8h_source.html |   2 +-
 docs/d7/dd4/request__signer_8h_source.html    | 155 ++--
 ...aka_1_1media_1_1mp4_1_1MP4MediaParser.html |   4 +-
 docs/d7/dd6/key__source_8cc_source.html       |   2 +-
 .../dda/classshaka_1_1media_1_1ByteQueue.html |   4 +-
 ...assshaka_1_1media_1_1RsaRequestSigner.html |   6 +-
 ...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 |  12 +-
 docs/d7/df9/byte__queue_8cc_source.html       |   4 +-
 ...edia_1_1H264ByteToUnitStreamConverter.html |   2 +-
 ...1_1media_1_1WebMClusterParser-members.html |   2 +-
 ..._1_1media_1_1mp2t_1_1TsWriter-members.html |   6 +-
 ..._1media_1_1mp4_1_1MovieHeader-members.html |   2 +-
 docs/d8/d0d/media__sample_8cc_source.html     |   4 +-
 ...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   |  14 +-
 ..._content__encodings__client_8h_source.html |  14 +-
 ...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 |   4 +-
 ...1media_1_1mp4_1_1MovieExtends-members.html |   2 +-
 docs/d8/d8e/classshaka_1_1AdaptationSet.html  |   2 +-
 ...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  |   2 +-
 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 |  14 +-
 ...1_1WebMContentEncodingsClient-members.html |   2 +-
 ...ctshaka_1_1media_1_1mp4_1_1CueTimeBox.html |   2 +-
 docs/d8/dca/ts__writer_8h_source.html         |  22 +-
 ...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  |   2 +-
 .../de6/webm__crypto__helpers_8h_source.html  |  37 +-
 ..._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 |   6 +-
 ...a_1_1media_1_1SegmentTestBase-members.html |   4 +-
 ...to__byte__stream__converter_8h_source.html |   2 +-
 ...media_1_1OnMediaEndParameters-members.html |   2 +-
 ...2single__segment__segmenter_8h_source.html |  10 +-
 docs/d9/d08/mock__mpd__builder_8h_source.html |   2 +-
 ...dia_1_1HlsNotifyMuxerListener-members.html |   2 +-
 .../classshaka_1_1media_1_1RsaPublicKey.html  |   2 +-
 .../classshaka_1_1media_1_1BufferReader.html  |   2 +-
 .../key__rotation__fragmenter_8cc_source.html |  14 +-
 ...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   | 163 ++--
 ...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 |   2 +-
 ...assshaka_1_1media_1_1AesRequestSigner.html |   4 +-
 ...1ProtectionSystemSpecificInfo-members.html |   2 +-
 docs/d9/d90/text__track_8h_source.html        |  18 +-
 docs/d9/d93/media__stream_8h_source.html      |   8 +-
 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 |   4 +-
 ..._1_1CompositionOffsetIterator-members.html |   2 +-
 ...ntent__protection__element_8cc_source.html |   2 +-
 docs/d9/db9/muxer_8cc_source.html             | 236 ++---
 .../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 |  10 +-
 .../muxer__listener__internal_8cc_source.html |   2 +-
 .../de6/classshaka_1_1media_1_1LocalFile.html |   2 +-
 ...ka_1_1media_1_1FixedKeySource-members.html |   4 +-
 ...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 |   2 +-
 .../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  |   4 +-
 ...haka_1_1media_1_1mp2t_1_1EsParserH26x.html |   8 +-
 docs/da/d23/ts__muxer_8h_source.html          |   4 +-
 docs/da/d24/h265__parser_8h_source.html       |   8 +-
 docs/da/d2a/text__stream__info_8h_source.html |   2 +-
 ...1_1media_1_1webm_1_1WebMMuxer-members.html |   6 +-
 ...ia_1_1mp4_1_1PixelAspectRatio-members.html |   2 +-
 ..._2multi__segment__segmenter_8h_source.html |   8 +-
 ...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  |   4 +-
 ..._1_1media_1_1mp4_1_1CompactSampleSize.html |   2 +-
 .../d5c/widevine__key__source_8h_source.html  | 233 +++--
 ...1_1H264VideoSliceHeaderParser-members.html |   2 +-
 ...mp4_1_1SingleSegmentSegmenter-members.html |   6 +-
 ..._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 |   6 +-
 docs/da/d88/mp4__muxer_8cc_source.html        |  14 +-
 ...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 |   4 +-
 ...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         |  14 +-
 ..._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 |  20 +-
 ...a_1_1mp4_1_1SampleDescription-members.html |   2 +-
 .../da/de2/mock__mpd__builder_8cc_source.html |   4 +-
 ...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    |   2 +-
 ..._1_1media_1_1mp4_1_1SampleDescription.html |   2 +-
 ...1_1media_1_1AesPatternCryptor-members.html |   4 +-
 ...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 |  10 +-
 ...to__unit__stream__converter_8h_source.html |   2 +-
 .../d31/track__run__iterator_8cc_source.html  |  12 +-
 ...1_1mp2t_1_1PesPacketGenerator-members.html |   6 +-
 ...dia_1_1VideoSliceHeaderParser-members.html |   2 +-
 ...pd__notify__muxer__listener_8h_source.html |  12 +-
 .../d4b/classshaka_1_1MockAdaptationSet.html  |   2 +-
 ...a_1_1mp4_1_1CompositionOffsetIterator.html |   2 +-
 .../db/d51/mp2t__media__parser_8h_source.html | 187 ++--
 ..._single__segment__segmenter_8h_source.html |  83 +-
 .../d5a/classshaka_1_1media_1_1VP9Parser.html |   2 +-
 docs/db/d60/mpd__options_8h_source.html       |   2 +-
 .../d64/webvtt__media__parser_8h_source.html  |  10 +-
 ..._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 |   8 +-
 ..._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         |   4 +-
 ...classshaka_1_1media_1_1ClusterBuilder.html |  16 +-
 ...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 |  24 +-
 .../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      |  10 +-
 .../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 |   4 +-
 docs/db/df6/muxer_8h_source.html              |  32 +-
 ...edia_1_1H265ByteToUnitStreamConverter.html |   2 +-
 docs/db/dfb/mpd__utils_8cc_source.html        |   2 +-
 ...d__notify__muxer__listener_8cc_source.html |  10 +-
 ..._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  |   2 +-
 ...ed__key__encryption__flags_8cc_source.html |   2 +-
 .../d3c/webm__cluster__parser_8h_source.html  |  22 +-
 docs/dc/d3f/key__source_8h_source.html        | 123 ++-
 .../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 |   2 +-
 .../decoding__time__iterator_8h_source.html   |   2 +-
 docs/dc/d53/webm_2segmenter_8cc_source.html   |   8 +-
 ...haka_1_1media_1_1H264DecRefPicMarking.html |   2 +-
 .../dc/d58/webm__media__parser_8h_source.html |  14 +-
 .../dc/d5c/classshaka_1_1MockMpdNotifier.html |   2 +-
 ...edia_1_1mp4_1_1CueSettingsBox-members.html |   2 +-
 ...1_1media_1_1webm_1_1Segmenter-members.html |   6 +-
 ...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      |  10 +-
 ...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     |  10 +-
 ...lassshaka_1_1media_1_1ContentEncoding.html |   6 +-
 ...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          |   2 +-
 .../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 |  24 +-
 ...ebm_1_1SingleSegmentSegmenter-members.html |   8 +-
 ...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      |  36 +-
 docs/dd/d12/mpd__writer_8cc_source.html       |  30 +-
 ...mp4_1_1SampleAuxiliaryInformationSize.html |   2 +-
 .../d17/classshaka_1_1media_1_1Demuxer.html   |  10 +-
 docs/dd/d18/es__parser__adts_8h_source.html   |  16 +-
 .../d19/video__stream__info_8cc_source.html   |   2 +-
 .../dd/d30/wvm__media__parser_8cc_source.html |   8 +-
 docs/dd/d3b/mp4_2segmenter_8h_source.html     |  26 +-
 ...ctshaka_1_1media_1_1mp4_1_1SyncSample.html |   2 +-
 docs/dd/d42/encryptor_8h_source.html          | 111 +--
 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 |   4 +-
 ...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      | 301 +++---
 docs/dd/d87/memory__file_8cc_source.html      |  12 +-
 .../d88/pes__packet__generator_8h_source.html |  22 +-
 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 |  20 +-
 ...info__dump__muxer__listener_8h_source.html |  45 +-
 docs/dd/dab/webm__muxer_8h_source.html        |   4 +-
 ..._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 |   4 +-
 docs/dd/dbc/buffer__reader_8cc_source.html    |   2 +-
 ...structshaka_1_1media_1_1EncryptionKey.html |   4 +-
 ...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 |  16 +-
 ...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          | 215 ++---
 docs/dd/dee/box__definitions_8cc_source.html  |   2 +-
 ..._2multi__segment__segmenter_8h_source.html |  91 +-
 ...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        |  14 +-
 docs/de/d15/media__stream_8cc_source.html     |   2 +-
 ...a_1_1media_1_1TextTrackConfig-members.html |   2 +-
 docs/de/d17/cluster__builder_8cc_source.html  |  20 +-
 ...edia_1_1wvm_1_1WvmMediaParser-members.html |   2 +-
 ...single__segment__segmenter_8cc_source.html |  18 +-
 .../d22/aes__pattern__cryptor_8cc_source.html |  14 +-
 ..._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 |   4 +-
 ...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 |  10 +-
 ...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 |  18 +-
 ..._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 |   6 +-
 docs/de/d7b/mp4__media__parser_8h_source.html | 186 ++--
 ...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  | 591 ++++++------
 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            |  22 +-
 .../classshaka_1_1media_1_1H265Parser.html    |   2 +-
 ..._1mp4_1_1DecodingTimeToSample-members.html |   2 +-
 docs/de/dcb/ts__segmenter_8h_source.html      |  22 +-
 .../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 |   6 +-
 ...shaka_1_1media_1_1mp2t_1_1TsSegmenter.html |  18 +-
 ..._1_1media_1_1mp4_1_1MediaData-members.html |   2 +-
 ..._1media_1_1DecoderConfigurationRecord.html |   2 +-
 ...a_1_1media_1_1mp4_1_1MP4Muxer-members.html |   6 +-
 .../de4/structshaka_1_1media_1_1H264Pps.html  |   2 +-
 ...edia_1_1H26xByteToUnitStreamConverter.html |   2 +-
 ...1media_1_1mp4_1_1DecodingTimeToSample.html |   2 +-
 ...a_1_1media_1_1mp4_1_1TrackRunIterator.html |  10 +-
 ...ssshaka_1_1media_1_1webm_1_1Encryptor.html |   4 +-
 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 |   4 +-
 docs/df/d46/classshaka_1_1media_1_1Muxer.html |  26 +-
 ...ka_1_1media_1_1ThreadedIoFile-members.html |   4 +-
 ...t_1_1AacProgramMapTableWriter-members.html |   2 +-
 ...aka_1_1media_1_1RsaPrivateKey-members.html |   2 +-
 ..._1mp4_1_1EncryptingFragmenter-members.html |   6 +-
 docs/df/d60/classshaka_1_1MockMpdBuilder.html |  10 +-
 ...mp4_1_1AudioRollRecoveryEntry-members.html |   2 +-
 .../classshaka_1_1media_1_1KeyFetcher.html    |   2 +-
 .../classshaka_1_1MockMpdBuilder-members.html |   4 +-
 ...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    |   2 +-
 ...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 |   6 +-
 docs/df/d8d/es__parser__h26x_8h_source.html   |  16 +-
 ..._1_1RepresentationStateChangeListener.html |   2 +-
 docs/df/d96/xml__node_8cc_source.html         |  12 +-
 ...dia_1_1mp4_1_1TrackFragmentDecodeTime.html |   2 +-
 ...shaka_1_1xml_1_1RepresentationXmlNode.html |   4 +-
 ..._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    |   4 +-
 ..._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    |  18 +-
 docs/df/dde/ts__section__psi_8cc_source.html  |   2 +-
 ...haka_1_1media_1_1H264SEIRecoveryPoint.html |   2 +-
 .../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                           |   6 +-
 docs/functions_b.html                         |   2 +-
 docs/functions_c.html                         |   6 +-
 docs/functions_d.html                         |   2 +-
 docs/functions_e.html                         |   4 +-
 docs/functions_enum.html                      |   2 +-
 docs/functions_eval.html                      |   2 +-
 docs/functions_f.html                         |   2 +-
 docs/functions_func.html                      |   6 +-
 docs/functions_func_b.html                    |   2 +-
 docs/functions_func_c.html                    |   6 +-
 docs/functions_func_d.html                    |   2 +-
 docs/functions_func_e.html                    |   4 +-
 docs/functions_func_f.html                    |   2 +-
 docs/functions_func_g.html                    |   6 +-
 docs/functions_func_h.html                    |   2 +-
 docs/functions_func_i.html                    |  10 +-
 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                    |   4 +-
 docs/functions_func_s.html                    |  16 +-
 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                         |   6 +-
 docs/functions_h.html                         |   2 +-
 docs/functions_i.html                         |  10 +-
 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                         |   4 +-
 docs/functions_s.html                         |  16 +-
 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_0.js                          |   4 +-
 docs/search/all_10.js                         |  14 +-
 docs/search/all_2.js                          |   4 +-
 docs/search/all_4.js                          |   2 +-
 docs/search/all_6.js                          |   4 +-
 docs/search/all_8.js                          |   8 +-
 docs/search/all_b.js                          |   2 +-
 docs/search/all_f.js                          |   2 +-
 docs/search/classes_a.js                      |   2 +-
 docs/search/functions_0.js                    |   4 +-
 docs/search/functions_10.js                   |  14 +-
 docs/search/functions_2.js                    |   4 +-
 docs/search/functions_4.js                    |   2 +-
 docs/search/functions_6.js                    |   4 +-
 docs/search/functions_8.js                    |   8 +-
 docs/search/functions_f.js                    |   2 +-
 957 files changed, 5621 insertions(+), 5614 deletions(-)

diff --git a/docs/annotated.html b/docs/annotated.html
index 0707638224..5675bc5c58 100644
--- a/docs/annotated.html
+++ b/docs/annotated.html
@@ -371,7 +371,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 cdb0676034..ec2114281f 100644
--- a/docs/classes.html
+++ b/docs/classes.html
@@ -146,8 +146,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <tr><td valign="top"><a class="el" href="db/d11/structshaka_1_1media_1_1mp4_1_1CodecConfiguration.html">CodecConfiguration</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html">H264SEIRecoveryPoint</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html">MpdNotifyMuxerListener</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">SegmentTestBase</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="da/de4/classshaka_1_1media_1_1WebMClusterParser.html">WebMClusterParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="da/d59/structshaka_1_1media_1_1mp4_1_1CompactSampleSize.html">CompactSampleSize</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/d59/structshaka_1_1media_1_1H264SliceHeader.html">H264SliceHeader</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> (<a class="el" href="d8/daf/namespaceshaka.html">shaka</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html">SegmentType</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html">WebMContentEncodingsClient</a> (shaka::media)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="d5/d8c/structshaka_1_1media_1_1mp4_1_1CompositionOffset.html">CompositionOffset</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d1/d0a/structshaka_1_1media_1_1H264Sps.html">H264Sps</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="db/dcd/classshaka_1_1MpdWriter.html">MpdWriter</a> (<a class="el" href="d8/daf/namespaceshaka.html">shaka</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d8/de1/classshaka_1_1SimpleMpdNotifier.html">SimpleMpdNotifier</a> (<a class="el" href="d8/daf/namespaceshaka.html">shaka</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="db/dae/classshaka_1_1media_1_1WebMInfoParser.html">WebMInfoParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
-<tr><td valign="top"><a class="el" href="db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html">CompositionOffsetIterator</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html">H264VideoSliceHeaderParser</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> (shaka::media::webm)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="dc/dca/classshaka_1_1media_1_1WebMListParser.html">WebMListParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
-<tr><td valign="top"><a class="el" href="df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html">CompositionTimeToSample</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> (shaka::media::webm)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">WebMMediaParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html">CompositionOffsetIterator</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html">H264VideoSliceHeaderParser</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="dc/dca/classshaka_1_1media_1_1WebMListParser.html">WebMListParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="df/d7b/structshaka_1_1media_1_1mp4_1_1CompositionTimeToSample.html">CompositionTimeToSample</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html">H264WeightingFactors</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> (shaka::media::webm)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> (shaka::media::webm)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">WebMMediaParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html">H265ByteToUnitStreamConverter</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html">Muxer</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d7/d07/structshaka_1_1media_1_1mp4_1_1SoundMediaHeader.html">SoundMediaHeader</a> (shaka::media::mp4)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html">WebMMuxer</a> (shaka::media::webm)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="da/d43/structshaka_1_1ContentProtectionElement.html">ContentProtectionElement</a> (<a class="el" href="d8/daf/namespaceshaka.html">shaka</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="de/dc2/classshaka_1_1media_1_1H265Parser.html">H265Parser</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d0/d93/classshaka_1_1media_1_1Status.html">Status</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a> (shaka::media)&#160;&#160;&#160;</td></tr>
 <tr><td valign="top"><a class="el" href="d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html">ContinuityCounter</a> (shaka::media::mp2t)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="de/d33/structshaka_1_1media_1_1H265Pps.html">H265Pps</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d2/d95/structshaka_1_1media_1_1StreamDescriptor.html">StreamDescriptor</a> (shaka::media)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a> (shaka::media)&#160;&#160;&#160;</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 cfe6fde644..30efaab59d 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 b0468547d6..4c5c10f18b 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 7935fac607..a121ee0807 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 bbe95e6b84..d77bd37437 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f386439816..a20c33051c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9d6d2712b7..7b5873ccf6 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 86058f99ec..04233926cd 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 9ab8868c51..50db0a5d9c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 8adfb49e84..334f423248 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 1fb7410764..93c0d0e2ba 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 82c95ad79f..05b116dddf 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 54a8a102fe..be2ae06ca0 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d2933aaa1b..2bc75ad240 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 24a521f431..2790cfe849 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 5b182b9375..853f1aea1b 100644
--- a/docs/d0/d33/classshaka_1_1MockRepresentation.html
+++ b/docs/d0/d33/classshaka_1_1MockRepresentation.html
@@ -147,8 +147,8 @@ Additional Inherited Members</h2></td></tr>
  }</td></tr>
 <tr class="separator:ad0c3f0dfed3c9b1cf4993530ea652661 inherit pub_types_classshaka_1_1Representation"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pro_methods_classshaka_1_1Representation"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_classshaka_1_1Representation')"><img src="../../closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td></tr>
-<tr class="memitem:ad029323166bb60175a2369c3e887dca0 inherit pro_methods_classshaka_1_1Representation"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">Representation</a> (const MediaInfo &amp;media_info, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, uint32_t representation_id, scoped_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt; state_change_listener)</td></tr>
-<tr class="separator:ad029323166bb60175a2369c3e887dca0 inherit pro_methods_classshaka_1_1Representation"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a997138fcaa5deef5151a64a2d7ce6aeb inherit pro_methods_classshaka_1_1Representation"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a> (const MediaInfo &amp;media_info, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt; state_change_listener)</td></tr>
+<tr class="separator:a997138fcaa5deef5151a64a2d7ce6aeb inherit pro_methods_classshaka_1_1Representation"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
@@ -160,7 +160,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 36caf287c7..5d6f645b04 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ae12467279..ff0a2ec038 100644
--- a/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html
+++ b/docs/d0/d3a/hls__notify__muxer__listener_8cc_source.html
@@ -95,8 +95,8 @@ 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/event/hls_notify_muxer_listener.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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</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/hls/base/hls_notifier.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/muxer_options.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/protection_system_specific_info.h&quot;</span></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 86d77f8ae1..819ae268d3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e09b6b9bd8..d1cb73076e 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 8e88d9ac69..13490630c1 100644
--- a/docs/d0/d42/aes__cryptor_8h_source.html
+++ b/docs/d0/d42/aes__cryptor_8h_source.html
@@ -96,11 +96,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef PACKAGER_MEDIA_BASE_AES_CRYPTOR_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define PACKAGER_MEDIA_BASE_AES_CRYPTOR_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;string&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/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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/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/base/fourccs.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">struct </span>aes_key_st;</div>
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">size_t</span> NumPaddingBytes(<span class="keywordtype">size_t</span> size) <span class="keyword">const</span>;</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">// Openssl AES_KEY.</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  scoped_ptr&lt;AES_KEY&gt; aes_key_;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  std::unique_ptr&lt;AES_KEY&gt; aes_key_;</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="comment">// Indicates whether a constant iv is used. Internal iv will be reset to</span></div>
 <div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="comment">// |iv_| before calling Crypt if that is the case.</span></div>
@@ -215,7 +215,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 86a26c0f4f..71da3a039a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 c306bc165b..694b50178b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 dcca1fae1a..d77ea21606 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d6e0b7a7d4..8620314e77 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 f97c4435fd..2b2b4e0fbc 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 e4d699f01e..f63a24e095 100644
--- a/docs/d0/d4e/libcrypto__threading_8cc_source.html
+++ b/docs/d0/d4e/libcrypto__threading_8cc_source.html
@@ -97,10 +97,10 @@ 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;openssl/thread.h&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 &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/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</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;<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/base/logging.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/synchronization/lock.h&quot;</span></div>
 <div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/threading/platform_thread.h&quot;</span></div>
 <div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div>
@@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">namespace </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;scoped_ptr&lt;base::Lock[]&gt; global_locks;</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;std::unique_ptr&lt;base::Lock[]&gt; global_locks;</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">void</span> LockFunction(<span class="keywordtype">int</span> mode, <span class="keywordtype">int</span> n, <span class="keyword">const</span> <span class="keywordtype">char</span>* file, <span class="keywordtype">int</span> line) {</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  VLOG(2) &lt;&lt; <span class="stringliteral">&quot;CryptoLock @ &quot;</span> &lt;&lt; file &lt;&lt; <span class="stringliteral">&quot;:&quot;</span> &lt;&lt; line;</div>
@@ -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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 773a7694f2..9433623cc3 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
@@ -108,8 +108,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Run</a>()</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68">set_clock</a>(base::Clock *clock)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">SetKeySource</a>(KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a>(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a>(scoped_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a>(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a>(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>streams</b>() const  (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>TsMuxer</b>(const MuxerOptions &amp;muxer_options) (defined in <a class="el" href="../../d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html">shaka::media::mp2t::TsMuxer</a>)</td><td class="entry"><a class="el" href="../../d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html">shaka::media::mp2t::TsMuxer</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~Muxer</b>() (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 990f0be8eb..f54f0f21fe 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 003a734d53..50244c3823 100644
--- a/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html
+++ b/docs/d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html
@@ -119,9 +119,9 @@ Public Types</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a5bb16e1f26c6df39fc5d209216a76eed"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5bb16e1f26c6df39fc5d209216a76eed"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b> (scoped_ptr&lt; <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>, <a class="el" href="../../d3/d8b/structshaka_1_1media_1_1FileCloser.html">FileCloser</a> &gt; internal_file, Mode mode, uint64_t io_cache_size, uint64_t io_block_size)</td></tr>
-<tr class="separator:a5bb16e1f26c6df39fc5d209216a76eed"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3ddd3e2e5297cbe02c8bb0e030e1612f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3ddd3e2e5297cbe02c8bb0e030e1612f"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b> (std::unique_ptr&lt; <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>, <a class="el" href="../../d3/d8b/structshaka_1_1media_1_1FileCloser.html">FileCloser</a> &gt; internal_file, Mode mode, uint64_t io_cache_size, uint64_t io_block_size)</td></tr>
+<tr class="separator:a3ddd3e2e5297cbe02c8bb0e030e1612f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">File implementation overrides.</div></td></tr>
 <tr class="memitem:a4a85d185a7eaa1abc857540ef703ab9a"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html#a4a85d185a7eaa1abc857540ef703ab9a">Close</a> () override</td></tr>
 <tr class="separator:a4a85d185a7eaa1abc857540ef703ab9a"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -438,7 +438,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 b00c10ceb5..4b96f74bac 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 c3550523cd..b55d688e47 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 864ab200fe..cb36021b3c 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 bb2ebea8c7..83ce809735 100644
--- a/docs/d0/d7d/decryptor__source_8h_source.html
+++ b/docs/d0/d7d/decryptor__source_8h_source.html
@@ -128,12 +128,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00031">key_source.h:31</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 be616c849d..881dee00a3 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 cf763e7033..026ed5f468 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 44c5007ec8..f2b9451b36 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 bf529c8c02..79799ea0af 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 5c637790c5..d1af6bc134 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 01bcf087f9..a0b8b71b5e 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 ab777f73b6..7cbfbfdc92 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ca9a844967..454eeedf3d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f151d4fbc3..b290d299fb 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
@@ -107,18 +107,18 @@ Inheritance diagram for shaka::media::mp4::SingleSegmentSegmenter:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ad373edd4313ee28809572db4a772164e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad373edd4313ee28809572db4a772164e"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>SingleSegmentSegmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, scoped_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, scoped_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
-<tr class="separator:ad373edd4313ee28809572db4a772164e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a60f12c2c9f62963bbb96193e5793d525"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a60f12c2c9f62963bbb96193e5793d525"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>SingleSegmentSegmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, std::unique_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, std::unique_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
+<tr class="separator:a60f12c2c9f62963bbb96193e5793d525"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">Segmenter implementation overrides.</div></td></tr>
 <tr class="memitem:a61e71cfc720342ecb16b830e6fca0fe4"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html#a61e71cfc720342ecb16b830e6fca0fe4">GetInitRange</a> (size_t *offset, size_t *size) override</td></tr>
 <tr class="separator:a61e71cfc720342ecb16b830e6fca0fe4"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5877fd31ed73a048529385b36437364a"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html#a5877fd31ed73a048529385b36437364a">GetIndexRange</a> (size_t *offset, size_t *size) override</td></tr>
 <tr class="separator:a5877fd31ed73a048529385b36437364a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter')"><img src="../../closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td></tr>
-<tr class="memitem:adad063c6e53e7193519381226c737ac8 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adad063c6e53e7193519381226c737ac8"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, scoped_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, scoped_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
-<tr class="separator:adad063c6e53e7193519381226c737ac8 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3338fa3d4cfe0f8ed12c2fe16735af58 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3338fa3d4cfe0f8ed12c2fe16735af58"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, std::unique_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, std::unique_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
+<tr class="separator:a3338fa3d4cfe0f8ed12c2fe16735af58 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0440c751fd818964397d17330acc7afc inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Initialize</a> (const std::vector&lt; <a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a> * &gt; &amp;streams, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td></tr>
 <tr class="separator:a0440c751fd818964397d17330acc7afc inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a464a30159b8888a54254356d191947ac inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">Finalize</a> ()</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ba4a8c2f66..29d7102961 100644
--- a/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html
+++ b/docs/d0/dac/classshaka_1_1media_1_1FixedKeySource.html
@@ -126,8 +126,9 @@ Public Member Functions</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
 Static Public Member Functions</h2></td></tr>
-<tr class="memitem:a091b4ea22419b73f8532db862f985f99"><td class="memItemLeft" align="right" valign="top">static scoped_ptr&lt; <a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">CreateFromHexStrings</a> (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)</td></tr>
-<tr class="separator:a091b4ea22419b73f8532db862f985f99"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9a91ba439d785022a1e2ceeaa9ebe81a"><td class="memItemLeft" align="right" valign="top">static std::unique_ptr<br class="typebreak"/>
+&lt; <a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">CreateFromHexStrings</a> (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)</td></tr>
+<tr class="separator:a9a91ba439d785022a1e2ceeaa9ebe81a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_static_methods_classshaka_1_1media_1_1KeySource"><td colspan="2" onclick="javascript:toggleInherit('pub_static_methods_classshaka_1_1media_1_1KeySource')"><img src="../../closed.png" alt="-"/>&#160;Static Public Member Functions inherited from <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td></tr>
 <tr class="memitem:a0963412e7ee33d0e34893ebdf38d96c1 inherit pub_static_methods_classshaka_1_1media_1_1KeySource"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0963412e7ee33d0e34893ebdf38d96c1"></a>
 static TrackType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">GetTrackTypeFromString</a> (const std::string &amp;track_type_string)</td></tr>
@@ -158,7 +159,7 @@ Additional Inherited Members</h2></td></tr>
 
 <p>Definition at line <a class="el" href="../../d3/d72/fixed__key__source_8h_source.html#l00027">27</a> of file <a class="el" href="../../d3/d72/fixed__key__source_8h_source.html">fixed_key_source.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a class="anchor" id="a091b4ea22419b73f8532db862f985f99"></a>
+<a class="anchor" id="a9a91ba439d785022a1e2ceeaa9ebe81a"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -166,7 +167,7 @@ Additional Inherited Members</h2></td></tr>
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">scoped_ptr&lt; <a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a> &gt; shaka::media::FixedKeySource::CreateFromHexStrings </td>
+          <td class="memname">std::unique_ptr&lt; <a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a> &gt; shaka::media::FixedKeySource::CreateFromHexStrings </td>
           <td>(</td>
           <td class="paramtype">const std::string &amp;&#160;</td>
           <td class="paramname"><em>key_id_hex</em>, </td>
@@ -479,7 +480,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3b731e2620..673a57d9c3 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>cluster_length_sec</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>cues</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DoFinalize</b>() override (defined in <a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(scoped_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(std::unique_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a>()</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a66c49dfab5316bea5b7b318871aef129">FromBMFFTimescale</a>(uint64_t time_timescale)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a8de27c5b6480f968cbef9eafec3731d7">FromWebMTimecode</a>(uint64_t time_webm_timecode)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#a75b572a055a0de68bf2809f61b319526">GetIndexRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#ae88bf7cfee4a1ad12c6060310b8f464e">GetInitRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>info</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a>(scoped_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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a>(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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MultiSegmentSegmenter</b>(const MuxerOptions &amp;options) (defined in <a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>muxer_listener</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 b9afe818a2..be267167c3 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 bbe5b73886..a29021be83 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 68e582cafa..b104525eba 100644
--- a/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html
+++ b/docs/d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 ee0ca93eac..dce21294c7 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4c797c8411..b33ff48ec4 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d94092cd46..7ee3d8a786 100644
--- a/docs/d0/dd6/webm__crypto__helpers_8cc_source.html
+++ b/docs/d0/dd6/webm__crypto__helpers_8cc_source.html
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                             <span class="keywordtype">int</span> data_size,</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                             <span class="keyword">const</span> uint8_t* key_id,</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                             <span class="keywordtype">int</span> key_id_size,</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                             scoped_ptr&lt;DecryptConfig&gt;* decrypt_config,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                             std::unique_ptr&lt;DecryptConfig&gt;* decrypt_config,</div>
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                             <span class="keywordtype">int</span>* data_offset) {</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordtype">int</span> header_size = kWebMSignalByteSize;</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordflow">if</span> (data_size &lt; header_size) {</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 38ea8a6398..7b6e27290b 100644
--- a/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html
+++ b/docs/d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html
@@ -157,7 +157,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00043">43</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00042">42</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/base/<a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a></li>
 <li>media/base/<a class="el" href="../../d5/da4/aes__encryptor_8cc_source.html">aes_encryptor.cc</a></li>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 413fa2eff5..1ff20da4f2 100644
--- a/docs/d0/dee/segmenter__test__base_8h_source.html
+++ b/docs/d0/dee/segmenter__test__base_8h_source.html
@@ -100,10 +100,10 @@ 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/media/base/media_sample.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/muxer_options.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/video_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/status.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/base/test/status_test_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/status.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/base/test/status_test_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/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/file/file_closer.h&quot;</span></div>
 <div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file_test_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/file/memory_file.h&quot;</span></div>
@@ -132,82 +132,83 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordtype">void</span> TearDown() <span class="keyword">override</span>;</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keyword">template</span> &lt;<span class="keyword">typename</span> S&gt;</div>
-<div class="line"><a name="l00047"></a><span class="lineno"><a class="line" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">   47</a></span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">CreateAndInitializeSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options,</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                    <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>* info,</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                                    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                                    scoped_ptr&lt;webm::Segmenter&gt;* result)<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    scoped_ptr&lt;S&gt; segmenter(<span class="keyword">new</span> S(options));</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;    scoped_ptr&lt;MkvWriter&gt; writer(<span class="keyword">new</span> <a class="code" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a>());</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    ASSERT_OK(writer-&gt;Open(options.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a5397ee8759a663aea68261600e528d82">output_file_name</a>));</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    ASSERT_OK(segmenter-&gt;Initialize(</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;        writer.Pass(), info, NULL <span class="comment">/* progress_listener */</span>,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        NULL <span class="comment">/* muxer_listener */</span>, key_source, 0 <span class="comment">/* max_sd_pixels */</span>,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        1 <span class="comment">/* clear_lead_in_seconds */</span>));</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    *result = segmenter.Pass();</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="l00063"></a><span class="lineno">   63</span>&#160;  scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">CreateSample</a>(KeyFrameFlag key_frame_flag,</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                                          uint64_t duration,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                                          SideDataFlag side_data_flag);</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">CreateMuxerOptions</a>() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">VideoStreamInfo</a>* <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a7e34fd92e43914bd2f032835cdc9b8a7">CreateVideoStreamInfo</a>() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  std::string <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#ace8082bd6dcd3aa07177c648f6ad7ecf">OutputFileName</a>() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  std::string <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#afa2cdde90c04bf69301a9589faa7efd9">TemplateFileName</a>(<span class="keywordtype">int</span> number) <span class="keyword">const</span>;</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">protected</span>:</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="comment">// A helper class used to determine the number of clusters and frames for a</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="comment">// given WebM file.</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno"><a class="line" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">   79</a></span>&#160;  <span class="keyword">class </span><a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a> : <span class="keyword">private</span> <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a> {</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;   <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a>();</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    ~<a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a>() <span class="keyword">override</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;    <span class="comment">// Make sure to use ASSERT_NO_FATAL_FAILURE.</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="keywordtype">void</span> PopulateFromCluster(<span class="keyword">const</span> std::string&amp; file_name);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordtype">void</span> PopulateFromSegment(<span class="keyword">const</span> std::string&amp; file_name);</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> GetFrameCountForCluster(<span class="keywordtype">size_t</span> i) <span class="keyword">const</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="keywordtype">int</span> cluster_count() <span class="keyword">const</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;   <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="comment">// WebMParserClient overrides.</span></div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* OnListStart(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</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="l00096"></a><span class="lineno">   96</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="l00097"></a><span class="lineno">   97</span>&#160;    <span class="keywordtype">bool</span> OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</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="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordtype">bool</span> OnString(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> std::string&amp; str) <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    std::vector&lt;int&gt; cluster_sizes_;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keywordtype">bool</span> in_cluster_;</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;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160; <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  std::string output_file_name_;</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  std::string segment_template_;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  uint64_t cur_time_timescale_;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordtype">bool</span> single_segment_;</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="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  // MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser_html"><div class="ttname"><a href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">shaka::media::SegmentTestBase::ClusterParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d0/dee/segmenter__test__base_8h_source.html#l00079">segmenter_test_base.h:79</a></div></div>
+<div class="line"><a name="l00047"></a><span class="lineno"><a class="line" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">   47</a></span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">CreateAndInitializeSegmenter</a>(</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;      <span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options,</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;      <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>* info,</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;      <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;      std::unique_ptr&lt;webm::Segmenter&gt;* result)<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    std::unique_ptr&lt;S&gt; segmenter(<span class="keyword">new</span> S(options));</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;    std::unique_ptr&lt;MkvWriter&gt; writer(<span class="keyword">new</span> <a class="code" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a>());</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    ASSERT_OK(writer-&gt;Open(options.<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a5397ee8759a663aea68261600e528d82">output_file_name</a>));</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    ASSERT_OK(segmenter-&gt;Initialize(</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        std::move(writer), info, NULL <span class="comment">/* progress_listener */</span>,</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        NULL <span class="comment">/* muxer_listener */</span>, key_source, 0 <span class="comment">/* max_sd_pixels */</span>,</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        1 <span class="comment">/* clear_lead_in_seconds */</span>));</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    *result = std::move(segmenter);</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="l00064"></a><span class="lineno">   64</span>&#160;  scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">CreateSample</a>(KeyFrameFlag key_frame_flag,</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                                          uint64_t duration,</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                                          SideDataFlag side_data_flag);</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">CreateMuxerOptions</a>() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <a class="code" href="../../d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html">VideoStreamInfo</a>* <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a7e34fd92e43914bd2f032835cdc9b8a7">CreateVideoStreamInfo</a>() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  std::string <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#ace8082bd6dcd3aa07177c648f6ad7ecf">OutputFileName</a>() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  std::string <a class="code" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#afa2cdde90c04bf69301a9589faa7efd9">TemplateFileName</a>(<span class="keywordtype">int</span> number) <span class="keyword">const</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; <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="comment">// A helper class used to determine the number of clusters and frames for a</span></div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="comment">// given WebM file.</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno"><a class="line" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">   80</a></span>&#160;  <span class="keyword">class </span><a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a> : <span class="keyword">private</span> <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a> {</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;   <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a>();</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    ~<a class="code" href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">ClusterParser</a>() <span class="keyword">override</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="comment">// Make sure to use ASSERT_NO_FATAL_FAILURE.</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="keywordtype">void</span> PopulateFromCluster(<span class="keyword">const</span> std::string&amp; file_name);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="keywordtype">void</span> PopulateFromSegment(<span class="keyword">const</span> std::string&amp; file_name);</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> GetFrameCountForCluster(<span class="keywordtype">size_t</span> i) <span class="keyword">const</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;    <span class="keywordtype">int</span> cluster_count() <span class="keyword">const</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="keyword">private</span>:</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="comment">// WebMParserClient overrides.</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* OnListStart(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</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="l00097"></a><span class="lineno">   97</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="l00098"></a><span class="lineno">   98</span>&#160;    <span class="keywordtype">bool</span> OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</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="l00100"></a><span class="lineno">  100</span>&#160;    <span class="keywordtype">bool</span> OnString(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> std::string&amp; str) <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    std::vector&lt;int&gt; cluster_sizes_;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keywordtype">bool</span> in_cluster_;</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; <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  std::string output_file_name_;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  std::string segment_template_;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  uint64_t cur_time_timescale_;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="keywordtype">bool</span> single_segment_;</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">// namespace media</span></div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;}  <span class="comment">// namespace shaka</span></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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser_html"><div class="ttname"><a href="../../d2/df8/classshaka_1_1media_1_1SegmentTestBase_1_1ClusterParser.html">shaka::media::SegmentTestBase::ClusterParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d0/dee/segmenter__test__base_8h_source.html#l00080">segmenter_test_base.h:80</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_1SegmentTestBase_html_a7e34fd92e43914bd2f032835cdc9b8a7"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a7e34fd92e43914bd2f032835cdc9b8a7">shaka::media::SegmentTestBase::CreateVideoStreamInfo</a></div><div class="ttdeci">VideoStreamInfo * CreateVideoStreamInfo() const </div><div class="ttdoc">Creates a video stream info object for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00094">segmenter_test_base.cc:94</a></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="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_1SegmentTestBase_html_ace8082bd6dcd3aa07177c648f6ad7ecf"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#ace8082bd6dcd3aa07177c648f6ad7ecf">shaka::media::SegmentTestBase::OutputFileName</a></div><div class="ttdeci">std::string OutputFileName() const </div><div class="ttdoc">Gets the file name of the current output file. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00101">segmenter_test_base.cc:101</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_adbb73df6171a6caa80cf34c7d63c650d"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">shaka::media::SegmentTestBase::CreateAndInitializeSegmenter</a></div><div class="ttdeci">void CreateAndInitializeSegmenter(const MuxerOptions &amp;options, StreamInfo *info, KeySource *key_source, scoped_ptr&lt; webm::Segmenter &gt; *result) const </div><div class="ttdoc">Creates a Segmenter of the given type and initializes it. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/dee/segmenter__test__base_8h_source.html#l00047">segmenter_test_base.h:47</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_aa6d43e2cc9d3abe023c037c87807f2ed"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">shaka::media::SegmentTestBase::CreateSample</a></div><div class="ttdeci">scoped_refptr&lt; MediaSample &gt; CreateSample(KeyFrameFlag key_frame_flag, uint64_t duration, SideDataFlag side_data_flag)</div><div class="ttdoc">Creates a new media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00056">segmenter_test_base.cc:56</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">shaka::media::MkvWriter</a></div><div class="ttdoc">An implementation of IMkvWriter using our File type. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dd6/mkv__writer_8h_source.html#l00021">mkv_writer.h:21</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_a742824b930ae928f12214a5e350adc64"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">shaka::media::SegmentTestBase::CreateAndInitializeSegmenter</a></div><div class="ttdeci">void CreateAndInitializeSegmenter(const MuxerOptions &amp;options, StreamInfo *info, KeySource *key_source, std::unique_ptr&lt; webm::Segmenter &gt; *result) const </div><div class="ttdoc">Creates a Segmenter of the given type and initializes it. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/dee/segmenter__test__base_8h_source.html#l00047">segmenter_test_base.h:47</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_a89d5ae5a78134e108a4fe4adb6f79e4e"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">shaka::media::SegmentTestBase::CreateMuxerOptions</a></div><div class="ttdeci">MuxerOptions CreateMuxerOptions() const </div><div class="ttdoc">Creates a Muxer options object for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00079">segmenter_test_base.cc:79</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#l00031">key_source.h:31</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_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_1SegmentTestBase_html_afa2cdde90c04bf69301a9589faa7efd9"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#afa2cdde90c04bf69301a9589faa7efd9">shaka::media::SegmentTestBase::TemplateFileName</a></div><div class="ttdeci">std::string TemplateFileName(int number) const </div><div class="ttdoc">Gets the file name of the given template file. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00105">segmenter_test_base.cc:105</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>
@@ -215,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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0367dfbd02..547cd0d6c4 100644
--- a/docs/d0/df3/packager__util_8cc_source.html
+++ b/docs/d0/df3/packager__util_8cc_source.html
@@ -131,8 +131,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
 <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;scoped_ptr&lt;RequestSigner&gt; CreateSigner() {</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  scoped_ptr&lt;RequestSigner&gt; signer;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;std::unique_ptr&lt;RequestSigner&gt; CreateSigner() {</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  std::unique_ptr&lt;RequestSigner&gt; signer;</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">if</span> (!FLAGS_aes_signing_key.empty()) {</div>
 <div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    signer.reset(<a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c">AesRequestSigner::CreateSigner</a>(</div>
@@ -141,7 +141,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot create an AES signer object from &#39;&quot;</span></div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                 &lt;&lt; FLAGS_aes_signing_key &lt;&lt; <span class="stringliteral">&quot;&#39;:&#39;&quot;</span> &lt;&lt; FLAGS_aes_signing_iv</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;RequestSigner&gt;();</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;RequestSigner&gt;();</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="keywordflow">else</span> <span class="keywordflow">if</span> (!FLAGS_rsa_signing_key_path.empty()) {</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    std::string rsa_private_key;</div>
@@ -149,69 +149,69 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                                &amp;rsa_private_key)) {</div>
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to read from &#39;&quot;</span> &lt;&lt; FLAGS_rsa_signing_key_path</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;                 &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;RequestSigner&gt;();</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;RequestSigner&gt;();</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;    signer.reset(<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">RsaRequestSigner::CreateSigner</a>(FLAGS_signer, rsa_private_key));</div>
 <div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keywordflow">if</span> (!signer) {</div>
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot create a RSA signer object from &#39;&quot;</span></div>
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;                 &lt;&lt; FLAGS_rsa_signing_key_path &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;RequestSigner&gt;();</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;RequestSigner&gt;();</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">return</span> signer.Pass();</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordflow">return</span> signer;</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;scoped_ptr&lt;KeySource&gt; CreateEncryptionKeySource() {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  scoped_ptr&lt;KeySource&gt; encryption_key_source;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;std::unique_ptr&lt;KeySource&gt; CreateEncryptionKeySource() {</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  std::unique_ptr&lt;KeySource&gt; encryption_key_source;</div>
 <div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">if</span> (FLAGS_enable_widevine_encryption) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    scoped_ptr&lt;WidevineKeySource&gt; widevine_key_source(</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    std::unique_ptr&lt;WidevineKeySource&gt; widevine_key_source(</div>
 <div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;        <span class="keyword">new</span> WidevineKeySource(FLAGS_key_server_url, FLAGS_include_common_pssh));</div>
 <div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordflow">if</span> (!FLAGS_signer.empty()) {</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      scoped_ptr&lt;RequestSigner&gt; request_signer(CreateSigner());</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      std::unique_ptr&lt;RequestSigner&gt; request_signer(CreateSigner());</div>
 <div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      <span class="keywordflow">if</span> (!request_signer)</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        <span class="keywordflow">return</span> scoped_ptr&lt;KeySource&gt;();</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      widevine_key_source-&gt;set_signer(request_signer.Pass());</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        <span class="keywordflow">return</span> std::unique_ptr&lt;KeySource&gt;();</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;      widevine_key_source-&gt;set_signer(std::move(request_signer));</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;    std::vector&lt;uint8_t&gt; content_id;</div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="keywordflow">if</span> (!base::HexStringToBytes(FLAGS_content_id, &amp;content_id)) {</div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid content_id hex string specified.&quot;</span>;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;KeySource&gt;();</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;KeySource&gt;();</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;    Status status = widevine_key_source-&gt;FetchKeys(content_id, FLAGS_policy);</div>
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">if</span> (!status.ok()) {</div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Widevine encryption key source failed to fetch keys: &quot;</span></div>
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;                 &lt;&lt; status.ToString();</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;KeySource&gt;();</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;KeySource&gt;();</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;    encryption_key_source = widevine_key_source.Pass();</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    encryption_key_source = std::move(widevine_key_source);</div>
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (FLAGS_enable_fixed_key_encryption) {</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    encryption_key_source = <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">FixedKeySource::CreateFromHexStrings</a>(</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    encryption_key_source = <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">FixedKeySource::CreateFromHexStrings</a>(</div>
 <div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        FLAGS_key_id, FLAGS_key, FLAGS_pssh, FLAGS_iv);</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="keywordflow">return</span> encryption_key_source.Pass();</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordflow">return</span> encryption_key_source;</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;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;scoped_ptr&lt;KeySource&gt; CreateDecryptionKeySource() {</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  scoped_ptr&lt;KeySource&gt; decryption_key_source;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;std::unique_ptr&lt;KeySource&gt; CreateDecryptionKeySource() {</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  std::unique_ptr&lt;KeySource&gt; decryption_key_source;</div>
 <div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordflow">if</span> (FLAGS_enable_widevine_decryption) {</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    scoped_ptr&lt;WidevineKeySource&gt; widevine_key_source(</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    std::unique_ptr&lt;WidevineKeySource&gt; widevine_key_source(</div>
 <div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        <span class="keyword">new</span> WidevineKeySource(FLAGS_key_server_url, FLAGS_include_common_pssh));</div>
 <div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">if</span> (!FLAGS_signer.empty()) {</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      scoped_ptr&lt;RequestSigner&gt; request_signer(CreateSigner());</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      std::unique_ptr&lt;RequestSigner&gt; request_signer(CreateSigner());</div>
 <div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;      <span class="keywordflow">if</span> (!request_signer)</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        <span class="keywordflow">return</span> scoped_ptr&lt;KeySource&gt;();</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      widevine_key_source-&gt;set_signer(request_signer.Pass());</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        <span class="keywordflow">return</span> std::unique_ptr&lt;KeySource&gt;();</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      widevine_key_source-&gt;set_signer(std::move(request_signer));</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;    decryption_key_source = widevine_key_source.Pass();</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    decryption_key_source = std::move(widevine_key_source);</div>
 <div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (FLAGS_enable_fixed_key_decryption) {</div>
 <div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">char</span> kNoPssh[] = <span class="stringliteral">&quot;&quot;</span>;</div>
 <div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keyword">const</span> <span class="keywordtype">char</span> kNoIv[] = <span class="stringliteral">&quot;&quot;</span>;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    decryption_key_source = <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">FixedKeySource::CreateFromHexStrings</a>(</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    decryption_key_source = <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">FixedKeySource::CreateFromHexStrings</a>(</div>
 <div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        FLAGS_key_id, FLAGS_key, kNoPssh, kNoIv);</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> decryption_key_source.Pass();</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  <span class="keywordflow">return</span> decryption_key_source;</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">bool</span> AssignFlagsFromProfile() {</div>
@@ -327,14 +327,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00063">request_signer.cc:63</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a091b4ea22419b73f8532db862f985f99"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">shaka::media::FixedKeySource::CreateFromHexStrings</a></div><div class="ttdeci">static scoped_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#l00086">fixed_key_source.cc:86</a></div></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_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#l00189">file.cc:189</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#l00086">fixed_key_source.cc:86</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#l00186">file.cc:186</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 2afbcff108..206dad7bdb 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 a4d46ff4d6..503e756663 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a2aa78ad80..5d696f4310 100644
--- a/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html
+++ b/docs/d1/d0a/structshaka_1_1media_1_1H264Sps.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 0dfface23d..550ecf9afd 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 979d429d91..72252fdb6c 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
@@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EmitSampleCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParser</b>(uint32_t pid) (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EsParserH264</b>(uint32_t pid, const NewStreamInfoCB &amp;new_stream_info_cb, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">shaka::media::mp2t::EsParserH264</a>)</td><td class="entry"><a class="el" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">shaka::media::mp2t::EsParserH264</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, scoped_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, std::unique_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Flush</b>() override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>NewStreamInfoCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Parse</b>(const uint8_t *buf, int size, int64_t pts, int64_t dts) override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 c654e6680c..40619c5c6d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f116367d19..4a5e478630 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
@@ -136,7 +136,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="comment">// forward-seeking in non-seekable files.</span></div>
 <div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="keywordtype">bool</span> ReadSkip(File* file, int64_t byte_count) {</div>
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keyword">const</span> int64_t kBufferSize = 0x40000;  <span class="comment">// 256KB.</span></div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  scoped_ptr&lt;char[]&gt; buffer(<span class="keyword">new</span> <span class="keywordtype">char</span>[kBufferSize]);</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  std::unique_ptr&lt;char[]&gt; buffer(<span class="keyword">new</span> <span class="keywordtype">char</span>[kBufferSize]);</div>
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  int64_t bytes_read = 0;</div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">while</span> (bytes_read &lt; byte_count) {</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    int64_t size = std::min(kBufferSize, byte_count - bytes_read);</div>
@@ -160,21 +160,21 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;TwoPassSingleSegmentSegmenter::~TwoPassSingleSegmentSegmenter() {}</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;Status</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;TwoPassSingleSegmentSegmenter::DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) {</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;Status TwoPassSingleSegmentSegmenter::DoInitialize(</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    std::unique_ptr&lt;MkvWriter&gt; writer) {</div>
 <div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="comment">// Assume the amount of time to copy the temp file as the same amount</span></div>
 <div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="comment">// of time as to make it.</span></div>
 <div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  set_progress_target(info()-&gt;duration() * 2);</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;  real_writer_ = writer.Pass();</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  real_writer_ = std::move(writer);</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;  temp_file_name_ = TempFileName(options());</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  scoped_ptr&lt;MkvWriter&gt; temp(<span class="keyword">new</span> MkvWriter);</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  std::unique_ptr&lt;MkvWriter&gt; temp(<span class="keyword">new</span> MkvWriter);</div>
 <div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  Status status = temp-&gt;Open(temp_file_name_);</div>
 <div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="keywordflow">return</span> status;</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">return</span> SingleSegmentSegmenter::DoInitialize(temp.Pass());</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keywordflow">return</span> SingleSegmentSegmenter::DoInitialize(std::move(temp));</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;Status TwoPassSingleSegmentSegmenter::DoFinalize() {</div>
@@ -182,7 +182,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    <span class="keywordflow">return</span> Status(error::FILE_FAILURE, <span class="stringliteral">&quot;Error finalizing cluster.&quot;</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">// Write the Cues to the end of the temp file.</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  uint64_t cues_pos = writer()-&gt;Position();</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  uint64_t cues_pos = writer()-&gt;<a class="code" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a468dcd83a7c087cc83e755703488e92b">Position</a>();</div>
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  set_index_start(cues_pos);</div>
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  seek_head()-&gt;set_cues_pos(cues_pos - segment_payload_pos());</div>
 <div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordflow">if</span> (!cues()-&gt;Write(writer()))</div>
@@ -194,8 +194,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordflow">return</span> temp;</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="comment">// Close the temp file and open it for reading.</span></div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  set_writer(scoped_ptr&lt;MkvWriter&gt;());</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; temp_reader(</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  set_writer(std::unique_ptr&lt;MkvWriter&gt;());</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; temp_reader(</div>
 <div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(temp_file_name_.c_str(), <span class="stringliteral">&quot;r&quot;</span>));</div>
 <div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="keywordflow">if</span> (!temp_reader)</div>
 <div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    <span class="keywordflow">return</span> Status(error::FILE_FAILURE, <span class="stringliteral">&quot;Error opening temp file.&quot;</span>);</div>
@@ -272,11 +272,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;}  <span class="comment">// namespace media</span></div>
 <div class="line"><a name="l00185"></a><span class="lineno">  185</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_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00167">file.cc:167</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>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00164">file.cc:164</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d665a4200c..e10d54be59 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b2be8da973..9d39ca5872 100644
--- a/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html
+++ b/docs/d1/d1f/classshaka_1_1media_1_1KeySource.html
@@ -154,7 +154,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html" title="KeySource is responsible for encryption key acquisition. ">KeySource</a> is responsible for encryption key acquisition. </p>
 
-<p>Definition at line <a class="el" href="../../dc/d3f/key__source_8h_source.html#l00031">31</a> of file <a class="el" href="../../dc/d3f/key__source_8h_source.html">key_source.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d3f/key__source_8h_source.html#l00030">30</a> of file <a class="el" href="../../dc/d3f/key__source_8h_source.html">key_source.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="aca6ecdac6ebc131d3626b765f64cb2de"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 681068cf26..e9089c897e 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 79511962c5..dd19ab191c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 c93dd9c39e..24fc6074f8 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 813406ebf4..558c55c1d6 100644
--- a/docs/d1/d2a/decryptor__source_8cc_source.html
+++ b/docs/d1/d2a/decryptor__source_8cc_source.html
@@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;    scoped_ptr&lt;AesCryptor&gt; aes_decryptor;</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>
@@ -143,7 +143,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;            scoped_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCtrDecryptor())));</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>
@@ -151,7 +151,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;            scoped_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> AesCbcDecryptor(kNoPadding))));</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>
@@ -204,12 +204,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00025">aes_pattern_cryptor.h:25</a></div></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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 73dbf3f65d..b40f4a1428 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 07a5ec443e..9876ac6d7e 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 823253361e..a4c6c00ff7 100644
--- a/docs/d1/d2f/webvtt__media__parser_8cc_source.html
+++ b/docs/d1/d2f/webvtt__media__parser_8cc_source.html
@@ -480,15 +480,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html_af6c0fb7de806cccd0e1f9dd92b5310f3"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#af6c0fb7de806cccd0e1f9dd92b5310f3">shaka::media::WebVttMediaParser::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/d2f/webvtt__media__parser_8cc_source.html#l00221">webvtt_media_parser.cc:221</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html_a5295c061b251726d1525cefc091101a2"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#a5295c061b251726d1525cefc091101a2">shaka::media::WebVttMediaParser::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/d2f/webvtt__media__parser_8cc_source.html#l00250">webvtt_media_parser.cc:250</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html_aa666cb1b9ee2ff940d9fc7efda4b50d7"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#aa666cb1b9ee2ff940d9fc7efda4b50d7">shaka::media::WebVttMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d2f/webvtt__media__parser_8cc_source.html#l00228">webvtt_media_parser.cc:228</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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_1TextStreamInfo_html"><div class="ttname"><a href="../../db/dab/classshaka_1_1media_1_1TextStreamInfo.html">shaka::media::TextStreamInfo</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d2a/text__stream__info_8h_source.html#l00017">text_stream_info.h:17</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="structshaka_1_1media_1_1Cue_html"><div class="ttname"><a href="../../dd/dce/structshaka_1_1media_1_1Cue.html">shaka::media::Cue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d64/webvtt__media__parser_8h_source.html#l00023">webvtt_media_parser.h:23</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 2069b0d146..6e9a0fb782 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
@@ -105,9 +105,9 @@ Inheritance diagram for shaka::media::mp2t::TsSectionPes:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ad0c32007d9f75a75d618e0cd52838775"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad0c32007d9f75a75d618e0cd52838775"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>TsSectionPes</b> (scoped_ptr&lt; <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">EsParser</a> &gt; es_parser)</td></tr>
-<tr class="separator:ad0c32007d9f75a75d618e0cd52838775"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a718daa16e09a503f21d949c17a29b60f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a718daa16e09a503f21d949c17a29b60f"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>TsSectionPes</b> (std::unique_ptr&lt; <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">EsParser</a> &gt; es_parser)</td></tr>
+<tr class="separator:a718daa16e09a503f21d949c17a29b60f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a233801f48a503e651e848605a0379bd7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a233801f48a503e651e848605a0379bd7"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>Parse</b> (bool payload_unit_start_indicator, const uint8_t *buf, int size) override</td></tr>
 <tr class="separator:a233801f48a503e651e848605a0379bd7"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -134,7 +134,7 @@ Additional Inherited Members</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="../../d5/d52/ts__section__pes_8h_source.html#l00021">21</a> of file <a class="el" href="../../d5/d52/ts__section__pes_8h_source.html">ts_section_pes.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/d52/ts__section__pes_8h_source.html#l00020">20</a> of file <a class="el" href="../../d5/d52/ts__section__pes_8h_source.html">ts_section_pes.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/formats/mp2t/<a class="el" href="../../d5/d52/ts__section__pes_8h_source.html">ts_section_pes.h</a></li>
 <li>media/formats/mp2t/<a class="el" href="../../d6/d6e/ts__section__pes_8cc_source.html">ts_section_pes.cc</a></li>
@@ -142,7 +142,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 8a5655e61c..6062cd72d7 100644
--- a/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html
+++ b/docs/d1/d31/classshaka_1_1xml_1_1XmlNode.html
@@ -137,7 +137,7 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>These classes are wrapper classes for XML elements for generating MPD. None of the pointer parameters should be NULL. None of the methods are meant to be overridden. </p>
 
-<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00031">31</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00032">32</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a52ffb838d25293eafbea9f05fb1c2d17"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3e57b35c1d..8ce9fc3ce9 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 b0135bdc04..dfea6fa374 100644
--- a/docs/d1/d37/es__parser__h264_8h_source.html
+++ b/docs/d1/d37/es__parser__h264_8h_source.html
@@ -95,65 +95,64 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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_h26x.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;<span class="keyword">class </span>H264Parser;</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>mp2t {</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">// Remark:</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// In this h264 parser, frame splitting is based on AUD nals.</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">// Mpeg2 TS spec: &quot;2.14 Carriage of Rec. ITU-T H.264 | ISO/IEC 14496-10 video&quot;</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">// &quot;Each AVC access unit shall contain an access unit delimiter NAL Unit;&quot;</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">   26</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a> : <span class="keyword">public</span> <a class="code" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">EsParserH26x</a> {</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a>(uint32_t pid,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;               <span class="keyword">const</span> NewStreamInfoCB&amp; new_stream_info_cb,</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;               <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb);</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  ~<a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a>() <span class="keyword">override</span>;</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">// EsParserH26x implementation override.</span></div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keywordtype">void</span> Reset() <span class="keyword">override</span>;</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="keyword">private</span>:</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="comment">// Processes a NAL unit found in ParseInternal.  The @a pps_id_for_access_unit</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="comment">// value will be passed to UpdateVideoDecoderConfig.</span></div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keywordtype">bool</span> ProcessNalu(<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="l00040"></a><span class="lineno">   40</span>&#160;                   <span class="keywordtype">bool</span>* is_key_frame,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                   <span class="keywordtype">int</span>* pps_id_for_access_unit) <span class="keyword">override</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;  <span class="comment">// Update the video decoder config based on an H264 SPS.</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="comment">// Return true if successful.</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordtype">bool</span> UpdateVideoDecoderConfig(<span class="keywordtype">int</span> sps_id) <span class="keyword">override</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="comment">// Callback to pass the stream configuration.</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  NewStreamInfoCB new_stream_info_cb_;</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;  scoped_refptr&lt;StreamInfo&gt; last_video_decoder_config_;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">bool</span> decoder_config_check_pending_;</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;  scoped_ptr&lt;H264Parser&gt; h264_parser_;</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="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1EsParserH264_html"><div class="ttname"><a href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">shaka::media::mp2t::EsParserH264</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d37/es__parser__h264_8h_source.html#l00026">es_parser_h264.h:26</a></div></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_h26x.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;<span class="keyword">class </span>H264Parser;</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>mp2t {</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">// Remark:</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">// In this h264 parser, frame splitting is based on AUD nals.</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment">// Mpeg2 TS spec: &quot;2.14 Carriage of Rec. ITU-T H.264 | ISO/IEC 14496-10 video&quot;</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">// &quot;Each AVC access unit shall contain an access unit delimiter NAL Unit;&quot;</span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">   25</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a> : <span class="keyword">public</span> <a class="code" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">EsParserH26x</a> {</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a>(uint32_t pid,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;               <span class="keyword">const</span> NewStreamInfoCB&amp; new_stream_info_cb,</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;               <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb);</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  ~<a class="code" href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">EsParserH264</a>() <span class="keyword">override</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="comment">// EsParserH26x implementation override.</span></div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">void</span> Reset() <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;  <span class="comment">// Processes a NAL unit found in ParseInternal.  The @a pps_id_for_access_unit</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="comment">// value will be passed to UpdateVideoDecoderConfig.</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">bool</span> ProcessNalu(<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="l00039"></a><span class="lineno">   39</span>&#160;                   <span class="keywordtype">bool</span>* is_key_frame,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                   <span class="keywordtype">int</span>* pps_id_for_access_unit) <span class="keyword">override</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;  <span class="comment">// Update the video decoder config based on an H264 SPS.</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="comment">// Return true if successful.</span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">bool</span> UpdateVideoDecoderConfig(<span class="keywordtype">int</span> sps_id) <span class="keyword">override</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="comment">// Callback to pass the stream configuration.</span></div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  NewStreamInfoCB new_stream_info_cb_;</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;  scoped_refptr&lt;StreamInfo&gt; last_video_decoder_config_;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">bool</span> decoder_config_check_pending_;</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;  std::unique_ptr&lt;H264Parser&gt; h264_parser_;</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="comment">// namespace mp2t</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1EsParserH264_html"><div class="ttname"><a href="../../d5/db9/classshaka_1_1media_1_1mp2t_1_1EsParserH264.html">shaka::media::mp2t::EsParserH264</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d37/es__parser__h264_8h_source.html#l00025">es_parser_h264.h:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1EsParserH26x_html"><div class="ttname"><a href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></div><div class="ttdef"><b>Definition:</b> <a href="../../df/d8d/es__parser__h26x_8h_source.html#l00028">es_parser_h26x.h:28</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 f9305028eb..a5a5c94888 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 e2f19c3d1a..968f61aca4 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 27b9ba0afb..d7a42eb378 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 2a5d813adf..5fb1dcae1d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 202f1b1545..32111a2d42 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d772ecb481..536a57ec8b 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 352d849414..c2a79788ec 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 09ead9c12c..05f9a816eb 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 06826660a2..9f43def213 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f90c77ff93..a419888342 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 affad580e0..afced796d7 100644
--- a/docs/d1/d74/mp2t__media__parser_8cc_source.html
+++ b/docs/d1/d74/mp2t__media__parser_8cc_source.html
@@ -93,8 +93,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;</div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/mp2t_media_parser.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/bind.h&quot;</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></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>
@@ -130,197 +130,197 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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, PidType pid_type,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;           scoped_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;  scoped_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, PidType pid_type,</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;                   scoped_ptr&lt;TsSection&gt; section_parser)</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    : pid_(pid),</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      pid_type_(pid_type),</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      section_parser_(section_parser.Pass()),</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      enable_(false),</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      continuity_counter_(-1) {</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  DCHECK(section_parser_);</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> PidState::PushTsPacket(<span class="keyword">const</span> TsPacket&amp; ts_packet) {</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  DCHECK_EQ(ts_packet.pid(), pid_);</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="comment">// The current PID is not part of the PID filter,</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// just discard the incoming TS packet.</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordflow">if</span> (!enable_)</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;  <span class="keywordtype">int</span> expected_continuity_counter = (continuity_counter_ + 1) % 16;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordflow">if</span> (continuity_counter_ &gt;= 0 &amp;&amp;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;      ts_packet.continuity_counter() != expected_continuity_counter) {</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</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="l00104"></a><span class="lineno">  104</span>&#160;    <span class="comment">// TODO(tinskip): Handle discontinuity better.</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;  <span class="keywordtype">bool</span> status = section_parser_-&gt;Parse(</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;      ts_packet.payload_unit_start_indicator(),</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;      ts_packet.payload(),</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      ts_packet.payload_size());</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">// At the minimum, when parsing failed, auto reset the section parser.</span></div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  <span class="comment">// Components that use the Mp2tMediaParser can take further action if needed.</span></div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <span class="keywordflow">if</span> (!status) {</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</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="l00117"></a><span class="lineno">  117</span>&#160;    ResetState();</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;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordflow">return</span> 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> PidState::Flush() {</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  section_parser_-&gt;Flush();</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  ResetState();</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">void</span> PidState::Enable() {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  enable_ = <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="keywordtype">void</span> PidState::Disable() {</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  <span class="keywordflow">if</span> (!enable_)</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="keywordflow">return</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;  ResetState();</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  enable_ = <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="keywordtype">bool</span> PidState::IsEnabled()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordflow">return</span> enable_;</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">  144</span>&#160;<span class="keywordtype">void</span> PidState::ResetState() {</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  section_parser_-&gt;Reset();</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  continuity_counter_ = -1;</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;Mp2tMediaParser::Mp2tMediaParser()</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    : sbr_in_mimetype_(false),</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;      is_initialized_(false) {</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;Mp2tMediaParser::~Mp2tMediaParser() {</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  STLDeleteValues(&amp;pids_);</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"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">  158</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="l00159"></a><span class="lineno">  159</span>&#160;    <span class="keyword">const</span> InitCB&amp; init_cb,</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;    <span class="keyword">const</span> NewSampleCB&amp; new_sample_cb,</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</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="l00162"></a><span class="lineno">  162</span>&#160;  DCHECK(!is_initialized_);</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(!init_cb.is_null());</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  DCHECK(!new_sample_cb.is_null());</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;  init_cb_ = init_cb;</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  new_sample_cb_ = new_sample_cb;</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="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">  171</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="l00172"></a><span class="lineno">  172</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Flush&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">// Flush the buffers and reset the pids.</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="keywordflow">for</span> (std::map&lt;int, PidState*&gt;::iterator it = pids_.begin();</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;       it != pids_.end(); ++it) {</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</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="l00178"></a><span class="lineno">  178</span>&#160;    PidState* pid_state = it-&gt;second;</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;    pid_state-&gt;Flush();</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="keywordtype">bool</span> result = EmitRemainingSamples();</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  STLDeleteValues(&amp;pids_);</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="comment">// Remove any bytes left in the TS buffer.</span></div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  <span class="comment">// (i.e. any partial TS packet =&gt; less than 188 bytes).</span></div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  ts_byte_queue_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">Reset</a>();</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keywordflow">return</span> result;</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;</div>
-<div class="line"><a name="l00190"></a><span class="lineno"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#af1a8a33b4ce61777c876717b005d0026">  190</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="l00191"></a><span class="lineno">  191</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::Parse size=&quot;</span> &lt;&lt; size;</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">// Add the data to the parser state.</span></div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  ts_byte_queue_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">Push</a>(buf, size);</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">while</span> (<span class="keyword">true</span>) {</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    <span class="keyword">const</span> uint8_t* ts_buffer;</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    <span class="keywordtype">int</span> ts_buffer_size;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    ts_byte_queue_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">Peek</a>(&amp;ts_buffer, &amp;ts_buffer_size);</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="keywordflow">if</span> (ts_buffer_size &lt; TsPacket::kPacketSize)</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;      <span class="keywordflow">break</span>;</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="comment">// Synchronization.</span></div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    <span class="keywordtype">int</span> skipped_bytes = TsPacket::Sync(ts_buffer, ts_buffer_size);</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;    <span class="keywordflow">if</span> (skipped_bytes &gt; 0) {</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</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="l00207"></a><span class="lineno">  207</span>&#160;               &lt;&lt; <span class="stringliteral">&quot; skipped_bytes=&quot;</span> &lt;&lt; skipped_bytes;</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;      ts_byte_queue_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(skipped_bytes);</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;      <span class="keywordflow">continue</span>;</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;    <span class="comment">// Parse the TS header, skipping 1 byte if the header is invalid.</span></div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    scoped_ptr&lt;TsPacket&gt; ts_packet(TsPacket::Parse(ts_buffer, ts_buffer_size));</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keywordflow">if</span> (!ts_packet) {</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;      DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Error: invalid TS packet&quot;</span>;</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;      ts_byte_queue_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(1);</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;      <span class="keywordflow">continue</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;    DVLOG(LOG_LEVEL_TS)</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;        &lt;&lt; <span class="stringliteral">&quot;Processing PID=&quot;</span> &lt;&lt; ts_packet-&gt;pid()</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</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="l00222"></a><span class="lineno">  222</span>&#160;</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    <span class="comment">// Parse the section.</span></div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    std::map&lt;int, PidState*&gt;::iterator it = 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;      scoped_ptr&lt;TsSection&gt; pat_section_parser(</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;          <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="l00230"></a><span class="lineno">  230</span>&#160;              base::Bind(&amp;Mp2tMediaParser::RegisterPmt,</div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;                         base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;      scoped_ptr&lt;PidState&gt; pat_pid_state(</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;          <span class="keyword">new</span> PidState(ts_packet-&gt;pid(), PidState::kPidPat,</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;                       pat_section_parser.Pass()));</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="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_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">Reset</a>();</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_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">Push</a>(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_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">Peek</a>(&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_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(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_.<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(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>
@@ -360,186 +360,184 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;TsSection&gt; pmt_section_parser(</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;      <span class="keyword">new</span> TsSectionPmt(</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;          base::Bind(&amp;Mp2tMediaParser::RegisterPes,</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;                     base::Unretained(<span class="keyword">this</span>), pmt_pid)));</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  scoped_ptr&lt;PidState&gt; pmt_pid_state(</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;      <span class="keyword">new</span> PidState(pmt_pid, PidState::kPidPmt, pmt_section_parser.Pass()));</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;  pmt_pid_state-&gt;Enable();</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;  pids_.insert(std::pair&lt;int, PidState*&gt;(pmt_pid, pmt_pid_state.release()));</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="keywordtype">void</span> Mp2tMediaParser::RegisterPes(<span class="keywordtype">int</span> pmt_pid,</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;                                  <span class="keywordtype">int</span> pes_pid,</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;                                  <span class="keywordtype">int</span> stream_type) {</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;RegisterPes:&quot;</span></div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;           &lt;&lt; <span class="stringliteral">&quot; pes_pid=&quot;</span> &lt;&lt; pes_pid</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</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="l00290"></a><span class="lineno">  290</span>&#160;  std::map&lt;int, PidState*&gt;::iterator it = pids_.find(pes_pid);</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  <span class="keywordflow">if</span> (it != pids_.end())</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;    <span class="keywordflow">return</span>;</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="comment">// Create a stream parser corresponding to the stream type.</span></div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keywordtype">bool</span> is_audio = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;  scoped_ptr&lt;EsParser&gt; es_parser;</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;  <span class="keywordflow">if</span> (stream_type == kStreamTypeAVC) {</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;        <span class="keyword">new</span> EsParserH264(</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</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;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeHEVC) {</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;        <span class="keyword">new</span> EsParserH265(</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</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;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;                       base::Unretained(<span class="keyword">this</span>))));</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type == kStreamTypeAAC) {</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;    es_parser.reset(</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;        <span class="keyword">new</span> EsParserAdts(</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;            pes_pid,</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;            base::Bind(&amp;Mp2tMediaParser::OnNewStreamInfo,</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;            base::Bind(&amp;Mp2tMediaParser::OnEmitSample,</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;                       base::Unretained(<span class="keyword">this</span>)),</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;            sbr_in_mimetype_));</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;    is_audio = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;    <span class="keywordflow">return</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;</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;  <span class="comment">// Create the PES state here.</span></div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Create a new PES state&quot;</span>;</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;  scoped_ptr&lt;TsSection&gt; pes_section_parser(</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;      <span class="keyword">new</span> TsSectionPes(es_parser.Pass()));</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;  PidState::PidType pid_type =</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;      is_audio ? PidState::kPidAudioPes : PidState::kPidVideoPes;</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  scoped_ptr&lt;PidState&gt; pes_pid_state(</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;      <span class="keyword">new</span> PidState(pes_pid, pid_type, pes_section_parser.Pass()));</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;  pes_pid_state-&gt;Enable();</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;  pids_.insert(std::pair&lt;int, PidState*&gt;(pes_pid, pes_pid_state.release()));</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">void</span> Mp2tMediaParser::OnNewStreamInfo(</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; new_stream_info) {</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  DCHECK(new_stream_info);</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</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="l00343"></a><span class="lineno">  343</span>&#160;</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;  PidMap::iterator pid_state = pids_.find(new_stream_info-&gt;track_id());</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</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="l00347"></a><span class="lineno">  347</span>&#160;               &lt;&lt; new_stream_info-&gt;track_id() &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="keywordflow">return</span>;</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;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  <span class="comment">// Set the stream configuration information for the PID.</span></div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  pid_state-&gt;second-&gt;set_config(new_stream_info);</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">// Finish initialization if all streams have configs.</span></div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  FinishInitializationIfNeeded();</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;</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::FinishInitializationIfNeeded() {</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;  <span class="comment">// Nothing to be done if already initialized.</span></div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;  <span class="keywordflow">if</span> (is_initialized_)</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;  <span class="comment">// Wait for more data to come to finish initialization.</span></div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;  <span class="keywordflow">if</span> (pids_.empty())</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</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;  std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt; all_stream_info;</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;  uint32_t num_es(0);</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator iter = pids_.begin(); iter != pids_.end();</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;       ++iter) {</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;    <span class="keywordflow">if</span> (((iter-&gt;second-&gt;pid_type() == PidState::kPidAudioPes) ||</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;         (iter-&gt;second-&gt;pid_type() == PidState::kPidVideoPes))) {</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;      ++num_es;</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;      <span class="keywordflow">if</span> (iter-&gt;second-&gt;config())</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;        all_stream_info.push_back(iter-&gt;second-&gt;config());</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="keywordflow">if</span> (num_es &amp;&amp; (all_stream_info.size() == num_es)) {</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;    <span class="comment">// All stream configurations have been received. Initialization can</span></div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;    <span class="comment">// be completed.</span></div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;    init_cb_.Run(all_stream_info);</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Mpeg2TS stream parser initialization done&quot;</span>;</div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    is_initialized_ = <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;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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="keywordtype">void</span> Mp2tMediaParser::OnEmitSample(</div>
-<div class="line"><a name="l00389"></a><span class="lineno">  389</span>&#160;    uint32_t pes_pid,</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; new_sample) {</div>
-<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;  DCHECK(new_sample);</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  DVLOG(LOG_LEVEL_ES)</div>
-<div class="line"><a name="l00393"></a><span class="lineno">  393</span>&#160;      &lt;&lt; <span class="stringliteral">&quot;OnEmitSample: &quot;</span></div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pid=&quot;</span></div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;      &lt;&lt; pes_pid</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; size=&quot;</span></div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;      &lt;&lt; new_sample-&gt;data_size()</div>
-<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; dts=&quot;</span></div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;      &lt;&lt; new_sample-&gt;dts()</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;      &lt;&lt; <span class="stringliteral">&quot; pts=&quot;</span></div>
-<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;      &lt;&lt; new_sample-&gt;pts();</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">// Add the sample to the appropriate PID sample queue.</span></div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  PidMap::iterator pid_state = pids_.find(pes_pid);</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  <span class="keywordflow">if</span> (pid_state == pids_.end()) {</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</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="l00407"></a><span class="lineno">  407</span>&#160;               &lt;&lt; pes_pid &lt;&lt; <span class="stringliteral">&quot;).&quot;</span>;</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;    <span class="keywordflow">return</span>;</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;  pid_state-&gt;second-&gt;sample_queue().push_back(new_sample);</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">  413</span>&#160;<span class="keywordtype">bool</span> Mp2tMediaParser::EmitRemainingSamples() {</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;  DVLOG(LOG_LEVEL_ES) &lt;&lt; <span class="stringliteral">&quot;Mp2tMediaParser::EmitRemainingBuffers&quot;</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">// No buffer should be sent until fully initialized.</span></div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  <span class="keywordflow">if</span> (!is_initialized_)</div>
-<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</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="comment">// Buffer emission.</span></div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  <span class="keywordflow">for</span> (PidMap::const_iterator pid_iter = pids_.begin(); pid_iter != pids_.end();</div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;       ++pid_iter) {</div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;    SampleQueue&amp; sample_queue = pid_iter-&gt;second-&gt;sample_queue();</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;    <span class="keywordflow">for</span> (SampleQueue::iterator sample_iter = sample_queue.begin();</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;         sample_iter != sample_queue.end();</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;         ++sample_iter) {</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;      <span class="keywordflow">if</span> (!new_sample_cb_.Run(pid_iter-&gt;first, *sample_iter)) {</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;        <span class="comment">// Error processing sample. Propagate error condition.</span></div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;    }</div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;    sample_queue.clear();</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;  <span class="keywordflow">return</span> <span class="keyword">true</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;</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</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#l00158">mp2t_media_parser.cc:158</a></div></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_1ByteQueue_html_acea792e406efe5119cec2e3e522e02c2"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">shaka::media::ByteQueue::Push</a></div><div class="ttdeci">void Push(const uint8_t *data, int size)</div><div class="ttdoc">Append new bytes to the end of the queue. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00029">byte_queue.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_a31b30d39d14fca3ce722b4233de95c79"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">shaka::media::ByteQueue::Pop</a></div><div class="ttdeci">void Pop(int count)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00070">byte_queue.cc:70</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#l00171">mp2t_media_parser.cc:171</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_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_1ByteQueue_html_ab1659ef71098c37e9fb4e55ab1664e84"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">shaka::media::ByteQueue::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset the queue to the empty state. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00024">byte_queue.cc:24</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_a838fe5642e533477a5e229981e5f06e7"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">shaka::media::ByteQueue::Peek</a></div><div class="ttdeci">void Peek(const uint8_t **data, int *size) const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00063">byte_queue.cc:63</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#l00031">key_source.h:31</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#l00190">mp2t_media_parser.cc:190</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 74a55a8389..fbe447df61 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 bff0d88545..2a34fc7ba1 100644
--- a/docs/d1/d7d/webm__video__client_8cc_source.html
+++ b/docs/d1/d7d/webm__video__client_8cc_source.html
@@ -270,7 +270,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8b0e129777..5a9dc08d99 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f2d17a26b4..6aeb00da7d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 afaa408990..2849d48e84 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a81a8e0064..6e50d11f4b 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>crypt_byte_block</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>data</b>() (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>earliest_presentation_time</b>() const  (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter</a>(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, scoped_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter</a>(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, std::unique_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>encryption_key</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>encryptor</b>() (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">FinalizeFragment</a>() override</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a208b7b8dd83e73c4206469695a3216d4">OptimizeSampleEntries</a>(std::vector&lt; T &gt; *entries, T *default_value)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html#a3bdb3a237cb8eb1484ee98e195d290a7">PrepareFragmentForEncryption</a>(bool enable_encryption) override</td><td class="entry"><a class="el" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html">shaka::media::mp4::KeyRotationFragmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>protection_scheme</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_encryption_key</b>(scoped_ptr&lt; EncryptionKey &gt; encryption_key) (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_encryption_key</b>(std::unique_ptr&lt; EncryptionKey &gt; encryption_key) (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a6f9d467d7188160ee445b74b6f0905f4">set_use_decoding_timestamp_in_timeline</a>(bool use_decoding_timestamp_in_timeline)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>skip_byte_block</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>traf</b>() (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 aa11b5f4dc..e5fda96b19 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 59fa684791..48e472ca8c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fad7bd3029..12446309ac 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 c7268c4d49..d488457825 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 045361c083..2c5a0170d2 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 f44c18d8df..4927658cf6 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 32c3c8401f..98eb409e58 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 695e6f4d88..3e99b57171 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d2d3f5144d..1a30389e05 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 8bed560d30..63e5af2640 100644
--- a/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html
+++ b/docs/d1/dad/classshaka_1_1media_1_1Demuxer-members.html
@@ -99,13 +99,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr><td class="entry"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">Initialize</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#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#acad9afa8ef3b5682324a4ded402ab93a">SetKeySource</a>(scoped_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 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 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f036291209..bc957b3e62 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 dff2ed8a17..4308dad808 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9f24ca2a10..842a43890a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 7d4ed94e5e..18b70c2d2c 100644
--- a/docs/d1/dcb/encrypting__fragmenter_8h_source.html
+++ b/docs/d1/dcb/encrypting__fragmenter_8h_source.html
@@ -96,8 +96,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_MP4_ENCRYPTING_FRAGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP4_ENCRYPTING_FRAGMENTER_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 &quot;packager/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/fourccs.h&quot;</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/video_slice_header_parser.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/vpx_parser.h&quot;</span></div>
@@ -115,9 +115,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
 <div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">EncryptingFragmenter</a> : <span class="keyword">public</span> <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a> {</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter</a>(scoped_refptr&lt;StreamInfo&gt; info,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter</a>(scoped_refptr&lt;StreamInfo&gt; info,</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                       <a class="code" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a>* traf,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                       scoped_ptr&lt;EncryptionKey&gt; encryption_key,</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                       std::unique_ptr&lt;EncryptionKey&gt; encryption_key,</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                       int64_t clear_time,</div>
 <div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                       FourCC protection_scheme,</div>
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                       uint8_t crypt_byte_block,</div>
@@ -142,8 +142,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  uint8_t crypt_byte_block()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> crypt_byte_block_; }</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  uint8_t skip_byte_block()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> skip_byte_block_; }</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">void</span> set_encryption_key(scoped_ptr&lt;EncryptionKey&gt; encryption_key) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    encryption_key_ = encryption_key.Pass();</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">void</span> set_encryption_key(std::unique_ptr&lt;EncryptionKey&gt; encryption_key) {</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    encryption_key_ = std::move(encryption_key);</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;</div>
 <div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160; <span class="keyword">private</span>:</div>
@@ -154,8 +154,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <span class="keywordtype">bool</span> IsSubsampleEncryptionRequired();</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;  scoped_refptr&lt;StreamInfo&gt; info_;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  scoped_ptr&lt;EncryptionKey&gt; encryption_key_;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  scoped_ptr&lt;AesCryptor&gt; encryptor_;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; encryption_key_;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  std::unique_ptr&lt;AesCryptor&gt; encryptor_;</div>
 <div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="comment">// If this stream contains AVC, subsample encryption specifies that the size</span></div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="comment">// and type of NAL units remain unencrypted. This function returns the size of</span></div>
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="comment">// the size field in bytes. Can be 1, 2 or 4 bytes.</span></div>
@@ -167,8 +167,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keyword">const</span> uint8_t skip_byte_block_;</div>
 <div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* listener_;</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;  scoped_ptr&lt;VPxParser&gt; vpx_parser_;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  scoped_ptr&lt;VideoSliceHeaderParser&gt; header_parser_;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  std::unique_ptr&lt;VPxParser&gt; vpx_parser_;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  std::unique_ptr&lt;VideoSliceHeaderParser&gt; header_parser_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">EncryptingFragmenter</a>);</div>
 <div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;};</div>
@@ -178,24 +178,24 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_FORMATS_MP4_ENCRYPTING_FRAGMENTER_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_afeb03755fa2e6a53376ae5ceb7440021"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">shaka::media::mp4::EncryptingFragmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00102">encrypting_fragmenter.cc:102</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_afeb03755fa2e6a53376ae5ceb7440021"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">shaka::media::mp4::EncryptingFragmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00106">encrypting_fragmenter.cc:106</a></div></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_1mp4_1_1EncryptingFragmenter_html_a126294f104809268975fe04391902ad3"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter::InitializeFragment</a></div><div class="ttdeci">Status InitializeFragment(int64_t first_sample_dts) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00117">encrypting_fragmenter.cc:117</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a5a331edd7e75f6cd15ccbe9c688440a4"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">shaka::media::mp4::EncryptingFragmenter::EncryptingFragmenter</a></div><div class="ttdeci">EncryptingFragmenter(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, scoped_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00061">encrypting_fragmenter.cc:61</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a126294f104809268975fe04391902ad3"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter::InitializeFragment</a></div><div class="ttdeci">Status InitializeFragment(int64_t first_sample_dts) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00121">encrypting_fragmenter.cc:121</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1TrackFragment_html"><div class="ttname"><a href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">shaka::media::mp4::TrackFragment</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00728">box_definitions.h:728</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a0de01823838c543cb8f6f8e330712ac2"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">shaka::media::mp4::EncryptingFragmenter::FinalizeFragment</a></div><div class="ttdeci">void FinalizeFragment() override</div><div class="ttdoc">Finalize and optimize the fragment. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00150">encrypting_fragmenter.cc:150</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a5cfbe43af4b1617853cef5fc2243003b"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">shaka::media::mp4::EncryptingFragmenter::FinalizeFragmentForEncryption</a></div><div class="ttdeci">virtual void FinalizeFragmentForEncryption()</div><div class="ttdoc">Finalize current fragment for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00166">encrypting_fragmenter.cc:166</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a0de01823838c543cb8f6f8e330712ac2"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">shaka::media::mp4::EncryptingFragmenter::FinalizeFragment</a></div><div class="ttdeci">void FinalizeFragment() override</div><div class="ttdoc">Finalize and optimize the fragment. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00154">encrypting_fragmenter.cc:154</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a5cfbe43af4b1617853cef5fc2243003b"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">shaka::media::mp4::EncryptingFragmenter::FinalizeFragmentForEncryption</a></div><div class="ttdeci">virtual void FinalizeFragmentForEncryption()</div><div class="ttdoc">Finalize current fragment for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00170">encrypting_fragmenter.cc:170</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#l00020">key_source.h:20</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_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>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00204">encrypting_fragmenter.cc:204</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_ace1882cf57dab24ee8e38765675e69a1"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">shaka::media::mp4::EncryptingFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">virtual Status PrepareFragmentForEncryption(bool enable_encryption)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00161">encrypting_fragmenter.cc:161</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00208">encrypting_fragmenter.cc:208</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_ace1882cf57dab24ee8e38765675e69a1"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">shaka::media::mp4::EncryptingFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">virtual Status PrepareFragmentForEncryption(bool enable_encryption)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00165">encrypting_fragmenter.cc:165</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a3c1c1037b7d9e6edf1f476434705c3d5"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">shaka::media::mp4::EncryptingFragmenter::EncryptingFragmenter</a></div><div class="ttdeci">EncryptingFragmenter(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, std::unique_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00061">encrypting_fragmenter.cc:61</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6211cc418e..534e5be5bc 100644
--- a/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html
+++ b/docs/d1/dd5/classshaka_1_1media_1_1Cluster.html
@@ -96,9 +96,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a21d32b476bfedbba21b2a02c13ce5736"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a21d32b476bfedbba21b2a02c13ce5736"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>Cluster</b> (scoped_ptr&lt; uint8_t[]&gt; data, int size)</td></tr>
-<tr class="separator:a21d32b476bfedbba21b2a02c13ce5736"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae0b5a8013e7522e0f2c347df69d7106b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae0b5a8013e7522e0f2c347df69d7106b"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>Cluster</b> (std::unique_ptr&lt; uint8_t[]&gt; data, int size)</td></tr>
+<tr class="separator:ae0b5a8013e7522e0f2c347df69d7106b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac4192e90dabe24f359d9b55a8fc43140"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac4192e90dabe24f359d9b55a8fc43140"></a>
 const uint8_t *&#160;</td><td class="memItemRight" valign="bottom"><b>data</b> () const </td></tr>
 <tr class="separator:ac4192e90dabe24f359d9b55a8fc43140"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -108,7 +108,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>size</b> () const </td
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d4/db2/cluster__builder_8h_source.html#l00014">14</a> of file <a class="el" href="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d4/db2/cluster__builder_8h_source.html#l00016">16</a> of file <a class="el" href="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.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="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.h</a></li>
 <li>media/formats/webm/<a class="el" href="../../de/d17/cluster__builder_8cc_source.html">cluster_builder.cc</a></li>
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 e5261e110e..b87056d421 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 b60bb81bb4..d5d9a2065a 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 bbb3e01f07..38a3aaeded 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 511a55f576..f7ddfb54f1 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 572131449f..f0567b9775 100644
--- a/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html
+++ b/docs/d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html
@@ -153,7 +153,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>AdaptationSetType specified in MPD. </p>
 
-<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00113">113</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00114">114</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a2718eede55bb89447a74ff802b95fdb1"></a>
 <div class="memitem">
@@ -197,7 +197,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0096d471ca..d1734077a5 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 821d1e03a4..b76ec48646 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fd55582a4e..47bc0569b5 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8cf8c106fd..94ed2f0535 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 47f329ac52..e27d6c2a1d 100644
--- a/docs/d1/df0/aes__encryptor_8h_source.html
+++ b/docs/d1/df0/aes__encryptor_8h_source.html
@@ -102,100 +102,99 @@ 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 &lt;vector&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/base/macros.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/aes_cryptor.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"><a class="line" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</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="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58">AesEncryptor</a>(ConstantIvFlag constant_iv_flag);</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  ~<a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa">InitializeWithIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key,</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;                        <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>) <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a>);</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">// Class which implements AES-CTR counter-mode encryption.</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">   43</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> {</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>();</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  ~<a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>() <span class="keyword">override</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;  uint32_t block_offset()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> block_offset_; }</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">private</span>:</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* plaintext,</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                     <span class="keywordtype">size_t</span> plaintext_size,</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                     uint8_t* ciphertext,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                     <span class="keywordtype">size_t</span>* ciphertext_size) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</span>;</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">// Current block offset.</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  uint32_t block_offset_;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="comment">// Current AES-CTR counter.</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  std::vector&lt;uint8_t&gt; counter_;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="comment">// Encrypted counter.</span></div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  std::vector&lt;uint8_t&gt; encrypted_counter_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>);</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">   67</span>&#160;<span class="keyword">enum</span> CbcPaddingScheme {</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="comment">// Residual block is left unencrypted.</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  kNoPadding,</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="comment">// Residual block is padded with pkcs5 and encrypted.</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  kPkcs5Padding,</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="comment">// Residual block and the next-to-last block are encrypted using ciphertext</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// stealing method.</span></div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  kCtsPadding,</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;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="comment">// Class which implements AES-CBC (Cipher block chaining) encryption.</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno"><a class="line" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">   78</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> {</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">AesCbcEncryptor</a>(CbcPaddingScheme padding_scheme);</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">AesCbcEncryptor</a>(CbcPaddingScheme padding_scheme,</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;                  ConstantIvFlag constant_iv_flag);</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;  ~<a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>() <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* plaintext,</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;                     <span class="keywordtype">size_t</span> plaintext_size,</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;                     uint8_t* ciphertext,</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;                     <span class="keywordtype">size_t</span>* ciphertext_size) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">size_t</span> NumPaddingBytes(<span class="keywordtype">size_t</span> size) <span class="keyword">const override</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;  <span class="keyword">const</span> CbcPaddingScheme padding_scheme_;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="comment">// 16-byte internal iv for crypto operations.</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  std::vector&lt;uint8_t&gt; internal_iv_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>);</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="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  // MEDIA_BASE_AES_ENCRYPTOR_H_</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/aes_cryptor.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"><a class="line" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</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="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58">AesEncryptor</a>(ConstantIvFlag constant_iv_flag);</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  ~<a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa">InitializeWithIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                        <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>) <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</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;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="comment">// Class which implements AES-CTR counter-mode encryption.</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno"><a class="line" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">   42</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> {</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>();</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  ~<a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>() <span class="keyword">override</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;  uint32_t block_offset()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> block_offset_; }</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">private</span>:</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* plaintext,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                     <span class="keywordtype">size_t</span> plaintext_size,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                     uint8_t* ciphertext,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                     <span class="keywordtype">size_t</span>* ciphertext_size) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</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;  <span class="comment">// Current block offset.</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  uint32_t block_offset_;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// Current AES-CTR counter.</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  std::vector&lt;uint8_t&gt; counter_;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="comment">// Encrypted counter.</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  std::vector&lt;uint8_t&gt; encrypted_counter_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>);</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="keyword">enum</span> CbcPaddingScheme {</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="comment">// Residual block is left unencrypted.</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  kNoPadding,</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="comment">// Residual block is padded with pkcs5 and encrypted.</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  kPkcs5Padding,</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="comment">// Residual block and the next-to-last block are encrypted using ciphertext</span></div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="comment">// stealing method.</span></div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  kCtsPadding,</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;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="comment">// Class which implements AES-CBC (Cipher block chaining) encryption.</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno"><a class="line" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">   77</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html">AesEncryptor</a> {</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">AesCbcEncryptor</a>(CbcPaddingScheme padding_scheme);</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">AesCbcEncryptor</a>(CbcPaddingScheme padding_scheme,</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;                  ConstantIvFlag constant_iv_flag);</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;  ~<a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>() <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* plaintext,</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;                     <span class="keywordtype">size_t</span> plaintext_size,</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;                     uint8_t* ciphertext,</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;                     <span class="keywordtype">size_t</span>* ciphertext_size) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordtype">size_t</span> NumPaddingBytes(<span class="keywordtype">size_t</span> size) <span class="keyword">const override</span>;</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="keyword">const</span> CbcPaddingScheme padding_scheme_;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="comment">// 16-byte internal iv for crypto operations.</span></div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  std::vector&lt;uint8_t&gt; internal_iv_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>);</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="comment">// namespace media</span></div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_AES_ENCRYPTOR_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="ttc" id="classshaka_1_1media_1_1AesCbcEncryptor_html_a2cc8f20b92d884d959b3a586b527fece"><div class="ttname"><a href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">shaka::media::AesCbcEncryptor::AesCbcEncryptor</a></div><div class="ttdeci">AesCbcEncryptor(CbcPaddingScheme padding_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/da4/aes__encryptor_8cc_source.html#l00099">aes_encryptor.cc:99</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesEncryptor_html_a0695df5615cadf6977fdbac978daeffa"><div class="ttname"><a href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa">shaka::media::AesEncryptor::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="../../d5/da4/aes__encryptor_8cc_source.html#l00039">aes_encryptor.cc:39</a></div></div>
 <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#l00078">aes_encryptor.h:78</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_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#l00043">aes_encryptor.h:43</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#l00022">aes_encryptor.h:22</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6f0b81224f..f6ef78e1fb 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 6417ccb9a6..0932bcff44 100644
--- a/docs/d1/df5/nalu__reader_8cc_source.html
+++ b/docs/d1/df5/nalu__reader_8cc_source.html
@@ -434,7 +434,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d2a719f351..e218d2463f 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2dd5903bfd..392af815f3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 e2e75b0020..2884ca3c39 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 9ac133fb62..1c885758d8 100644
--- a/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html
+++ b/docs/d2/d0f/classshaka_1_1MpdBuilder-members.html
@@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">AddAdaptationSet</a>(const std::string &amp;lang)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">AddBaseUrl</a>(const std::string &amp;base_url)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DynamicMpdBuilderTest</b> (defined in <a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a>)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">InjectClockForTesting</a>(scoped_ptr&lt; base::Clock &gt; clock)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a>(std::unique_ptr&lt; base::Clock &gt; clock)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>kDynamic</b> enum value (defined in <a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a>)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>kStatic</b> enum value (defined in <a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a>)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MakePathsRelativeToMpd</a>(const std::string &amp;mpd_path, MediaInfo *media_info)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 98e8663eb4..e4f709bc2f 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0a5c2bc7d2..dffab584c2 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 e96628f454..b887bc3862 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 89e834aac8..dc559fb27b 100644
--- a/docs/d2/d23/threaded__io__file_8cc_source.html
+++ b/docs/d2/d23/threaded__io__file_8cc_source.html
@@ -106,12 +106,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="keyword">using</span> base::subtle::NoBarrier_Load;</div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">using</span> base::subtle::NoBarrier_Store;</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;ThreadedIoFile::ThreadedIoFile(scoped_ptr&lt;File, FileCloser&gt; internal_file,</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;ThreadedIoFile::ThreadedIoFile(std::unique_ptr&lt;File, FileCloser&gt; internal_file,</div>
 <div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;                               Mode mode,</div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;                               uint64_t io_cache_size,</div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                               uint64_t io_block_size)</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    : File(internal_file-&gt;file_name()),</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      internal_file_(internal_file.Pass()),</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      internal_file_(std::move(internal_file)),</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;      mode_(mode),</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;      cache_(io_cache_size),</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;      io_buffer_(io_block_size),</div>
@@ -315,7 +315,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d90337ef71..d3480a53dd 100644
--- a/docs/d2/d24/packager__util_8h_source.html
+++ b/docs/d2/d24/packager__util_8h_source.html
@@ -99,49 +99,48 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define APP_PACKAGER_UTIL_H_</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;gflags/gflags.h&gt;</span></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/memory/scoped_ptr.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;DECLARE_bool(dump_stream_info);</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">struct </span>MpdOptions;</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>media {</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">class </span>KeySource;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">class </span>MediaStream;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">class </span>Muxer;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">struct </span>MuxerOptions;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</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="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;scoped_ptr&lt;KeySource&gt; CreateEncryptionKeySource();</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;scoped_ptr&lt;KeySource&gt; CreateDecryptionKeySource();</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keywordtype">bool</span> AssignFlagsFromProfile();</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="keywordtype">bool</span> GetMuxerOptions(MuxerOptions* muxer_options);</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keywordtype">bool</span> GetMpdOptions(MpdOptions* mpd_options);</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</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="l00065"></a><span class="lineno">   65</span>&#160;                      <span class="keyword">const</span> std::string&amp; stream_selector,</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                      <span class="keyword">const</span> std::string&amp; language_override,</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                      Muxer* muxer);</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">// namespace media</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // APP_PACKAGER_UTIL_H_</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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;DECLARE_bool(dump_stream_info);</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">struct </span>MpdOptions;</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>media {</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">class </span>KeySource;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">class </span>MediaStream;</div>
+<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="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>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;std::unique_ptr&lt;KeySource&gt; CreateDecryptionKeySource();</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="keywordtype">bool</span> AssignFlagsFromProfile();</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="keywordtype">bool</span> GetMuxerOptions(MuxerOptions* muxer_options);</div>
+<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="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>
+<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">// namespace media</span></div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // APP_PACKAGER_UTIL_H_</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 282912ab67..dbee7b972f 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
@@ -111,8 +111,8 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:ad0d22ca7f2d0a3d9d9158242394f235c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html#ad0d22ca7f2d0a3d9d9158242394f235c">KeyRotationFragmenter</a> (<a class="el" href="../../d9/d1f/structshaka_1_1media_1_1mp4_1_1MovieFragment.html">MovieFragment</a> *moof, scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> &gt; info, <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *traf, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, KeySource::TrackType track_type, int64_t crypto_period_duration, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener)</td></tr>
 <tr class="separator:ad0d22ca7f2d0a3d9d9158242394f235c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter')"><img src="../../closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td></tr>
-<tr class="memitem:a5a331edd7e75f6cd15ccbe9c688440a4 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter</a> (scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> &gt; info, <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *traf, scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *listener)</td></tr>
-<tr class="separator:a5a331edd7e75f6cd15ccbe9c688440a4 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3c1c1037b7d9e6edf1f476434705c3d5 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter</a> (scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> &gt; info, <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *traf, std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *listener)</td></tr>
+<tr class="separator:a3c1c1037b7d9e6edf1f476434705c3d5 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:afeb03755fa2e6a53376ae5ceb7440021 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample) override</td></tr>
 <tr class="separator:afeb03755fa2e6a53376ae5ceb7440021 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a126294f104809268975fe04391902ad3 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">InitializeFragment</a> (int64_t first_sample_dts) override</td></tr>
@@ -176,9 +176,9 @@ uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>crypt_byte_block</
 <tr class="memitem:a05d4dc71b3853d13c3250ca6572c14d0 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a05d4dc71b3853d13c3250ca6572c14d0"></a>
 uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>skip_byte_block</b> () const </td></tr>
 <tr class="separator:a05d4dc71b3853d13c3250ca6572c14d0 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4580cb2195b7c4909ad185abf17a68c8 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4580cb2195b7c4909ad185abf17a68c8"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b> (scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
-<tr class="separator:a4580cb2195b7c4909ad185abf17a68c8 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a6378d0ec695ff5b84a6b44aad4511383 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6378d0ec695ff5b84a6b44aad4511383"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b> (std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
+<tr class="separator:a6378d0ec695ff5b84a6b44aad4511383 inherit pro_methods_classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter')"><img src="../../closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td></tr>
 <tr class="memitem:a206f6568b2258fe9bcd271d8590d661d inherit pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a206f6568b2258fe9bcd271d8590d661d"></a>
 <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>traf</b> ()</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 34d76f877c..cb7756ab9d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d324b31cfe..59194f7955 100644
--- a/docs/d2/d33/video__slice__header__parser_8h_source.html
+++ b/docs/d2/d33/video__slice__header__parser_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f18bd0ac34..9d2adbf36f 100644
--- a/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html
+++ b/docs/d2/d35/classshaka_1_1media_1_1WidevineKeySource-members.html
@@ -104,8 +104,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>key_production_thread_</b> (defined in <a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a>)</td><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>KeySource</b>() (defined in <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a>)</td><td class="entry"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>NUM_VALID_TRACK_TYPES</b> enum value (defined in <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a>)</td><td class="entry"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">set_key_fetcher</a>(scoped_ptr&lt; KeyFetcher &gt; key_fetcher)</td><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">set_signer</a>(scoped_ptr&lt; RequestSigner &gt; signer)</td><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">set_key_fetcher</a>(std::unique_ptr&lt; KeyFetcher &gt; key_fetcher)</td><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">set_signer</a>(std::unique_ptr&lt; RequestSigner &gt; signer)</td><td class="entry"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">shaka::media::WidevineKeySource</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>TRACK_TYPE_AUDIO</b> enum value (defined in <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a>)</td><td class="entry"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>TRACK_TYPE_HD</b> enum value (defined in <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a>)</td><td class="entry"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>TRACK_TYPE_SD</b> enum value (defined in <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a>)</td><td class="entry"><a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">shaka::media::KeySource</a></td><td class="entry"></td></tr>
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 089a22455d..413fd7844a 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2105c72d3e..c167a6fddd 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9ef890bdf0..cfa7d6c249 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 38bdee139c..5ff9842ea8 100644
--- a/docs/d2/d4d/file_8h_source.html
+++ b/docs/d2/d4d/file_8h_source.html
@@ -171,27 +171,27 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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  // PACKAGER_FILE_FILE_H_</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_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00156">file.cc:156</a></div></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#l00207">file.cc:207</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00153">file.cc:153</a></div></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#l00204">file.cc:204</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_adffa2c3d12ae0a579704cf1f5b3bf8ab"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#adffa2c3d12ae0a579704cf1f5b3bf8ab">shaka::media::File::Size</a></div><div class="ttdeci">virtual int64_t Size()=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_aeb5c0673c6d8120d636385a1ad3b3f71"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#aeb5c0673c6d8120d636385a1ad3b3f71">shaka::media::File::~File</a></div><div class="ttdeci">virtual ~File()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d4d/file_8h_source.html#l00132">file.h:132</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_1File_html_a3149670c0d085e71f0aa085ee87fdda5"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a3149670c0d085e71f0aa085ee87fdda5">shaka::media::File::Write</a></div><div class="ttdeci">virtual int64_t Write(const void *buffer, uint64_t length)=0</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_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_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00236">file.cc:236</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00233">file.cc:233</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_a57dd80258b1989f85d99c154ba377db8"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a57dd80258b1989f85d99c154ba377db8">shaka::media::File::Tell</a></div><div class="ttdeci">virtual bool Tell(uint64_t *position)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_abe158b9e7b1e073956a16c55a8fcf5f4"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#abe158b9e7b1e073956a16c55a8fcf5f4">shaka::media::File::file_name</a></div><div class="ttdeci">const std::string &amp; file_name() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d4d/file_8h_source.html#l00091">file.h:91</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00180">file.cc:180</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#l00189">file.cc:189</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00177">file.cc:177</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#l00186">file.cc:186</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_aba73e887fbfe2de3a679c679ddf03f4b"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#aba73e887fbfe2de3a679c679ddf03f4b">shaka::media::File::Flush</a></div><div class="ttdeci">virtual bool Flush()=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_a3baaa3207abaeb6af1a8239ee866b5d3"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a3baaa3207abaeb6af1a8239ee866b5d3">shaka::media::File::Seek</a></div><div class="ttdeci">virtual bool Seek(uint64_t position)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ThreadedIoFile_html"><div class="ttname"><a href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></div><div class="ttdoc">Declaration of class which implements a thread-safe circular buffer. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/da6/threaded__io__file_8h_source.html#l00021">threaded_io_file.h:21</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00167">file.cc:167</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00164">file.cc:164</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 2938dc890e..707c01d907 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1d6f8b422f..734cfad3a7 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 5d9a69618e..ed8adc83c6 100644
--- a/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html
+++ b/docs/d2/d59/structshaka_1_1media_1_1H264SliceHeader.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3bd53f8682..02a2b68bda 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 151b9568ce..f0f7f1048a 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d4fd424a03..f4518ab821 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 65fe64c395..e83befcfdd 100644
--- a/docs/d2/d62/simple__mpd__notifier_8h_source.html
+++ b/docs/d2/d62/simple__mpd__notifier_8h_source.html
@@ -97,11 +97,11 @@ 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 MPD_BASE_SIMPLE_MPD_NOTIFIER_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;string&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/base/gtest_prod_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/memory/scoped_ptr.h&quot;</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;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/base/gtest_prod_util.h&quot;</span></div>
 <div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/synchronization/lock.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/mpd_notifier.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/mpd_notifier_util.h&quot;</span></div>
@@ -149,13 +149,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">   67</span>&#160;  <span class="comment">// Testing only method. Sets mpd_builder_.</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> SetMpdBuilderForTesting(scoped_ptr&lt;MpdBuilder&gt; mpd_builder) {</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    mpd_builder_ = mpd_builder.Pass();</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> SetMpdBuilderForTesting(std::unique_ptr&lt;MpdBuilder&gt; mpd_builder) {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    mpd_builder_ = std::move(mpd_builder);</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="comment">// MPD output path.</span></div>
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  std::string output_path_;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  scoped_ptr&lt;MpdBuilder&gt; mpd_builder_;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  std::unique_ptr&lt;MpdBuilder&gt; mpd_builder_;</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  base::Lock lock_;</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="keyword">typedef</span> std::map&lt;std::string, AdaptationSet*&gt; AdaptationSetMap;</div>
@@ -186,7 +186,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 db08159089..ce35ef0929 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 ea21016694..f116e3d52e 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8c73e7959a..fd1b4ba99c 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a2c26936d6..dcbdba924f 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 32d6eeb832..fc42d9360c 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 2abd28cf6f..496dc97cad 100644
--- a/docs/d2/d7b/simple__mpd__notifier_8cc_source.html
+++ b/docs/d2/d7b/simple__mpd__notifier_8cc_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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 52666339c9..6195d3c39b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ffb1bd13a6..ecd465c5df 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 bcb9787029..9a340c4394 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1977a62c26..64c952652f 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4a27a252c2..3bbe3bf565 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 c1fc002ad0..42ce9cade6 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 24c65a5306..be17bd3b86 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 78e4f2696c..430d934bdb 100644
--- a/docs/d2/da6/threaded__io__file_8h_source.html
+++ b/docs/d2/da6/threaded__io__file_8h_source.html
@@ -96,8 +96,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef PACKAGER_FILE_THREADED_IO_FILE_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define PACKAGER_FILE_THREADED_IO_FILE_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 &quot;packager/base/atomicops.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/atomicops.h&quot;</span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/synchronization/waitable_event.h&quot;</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file_closer.h&quot;</span></div>
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    kOutputMode</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;  <a class="code" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">ThreadedIoFile</a>(scoped_ptr&lt;File, FileCloser&gt; internal_file,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <a class="code" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">ThreadedIoFile</a>(std::unique_ptr&lt;File, FileCloser&gt; internal_file,</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                 Mode mode,</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                 uint64_t io_cache_size,</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                 uint64_t io_block_size);</div>
@@ -138,7 +138,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">void</span> RunInInputMode();</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">void</span> RunInOutputMode();</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;  scoped_ptr&lt;File, FileCloser&gt; internal_file_;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; internal_file_;</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keyword">const</span> Mode mode_;</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <a class="code" href="../../dd/d7c/classshaka_1_1media_1_1IoCache.html">IoCache</a> cache_;</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  std::vector&lt;uint8_t&gt; io_buffer_;</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 ec598d3b1a..da3ee96c4c 100644
--- a/docs/d2/da8/mp4_2segmenter_8cc_source.html
+++ b/docs/d2/da8/mp4_2segmenter_8cc_source.html
@@ -236,11 +236,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;                     scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;                     scoped_ptr&lt;Movie&gt; moov)</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_(ftyp.Pass()),</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;      moov_(moov.Pass()),</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>
@@ -252,7 +252,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#a144b19be7c3f693b06da2fbe2e40587a">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"><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>
@@ -319,7 +319,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
 <div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status =</div>
 <div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;        encryption_key_source-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(track_type, encryption_key.get());</div>
 <div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
@@ -348,7 +348,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="l00262"></a><span class="lineno">  262</span>&#160;        streams[i]-&gt;info(), &amp;moof_-&gt;tracks[i], encryption_key.Pass(),</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>
@@ -584,15 +584,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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="classshaka_1_1media_1_1webm_1_1Segmenter_html_a144b19be7c3f693b06da2fbe2e40587a"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">shaka::media::webm::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(scoped_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#l00049">segmenter.cc:49</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#l00020">key_source.h:20</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_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#l00049">segmenter.cc:49</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>
 <div class="ttc" id="classshaka_1_1media_1_1ProgressListener_html_a9c32e569c50194a106f7e9242749e7e7"><div class="ttname"><a href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">shaka::media::ProgressListener::OnProgress</a></div><div class="ttdeci">virtual void OnProgress(double progress)=0</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_1webm_1_1Segmenter_html_aa84782877f1afaf9519a552ac3d5d417"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">shaka::media::webm::Segmenter::Finalize</a></div><div class="ttdeci">Status Finalize()</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00107">segmenter.cc:107</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#l00031">key_source.h:31</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_1webm_1_1Segmenter_html_a32dc8b7461252b99fe52384b04e3bca2"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a32dc8b7461252b99fe52384b04e3bca2">shaka::media::webm::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="../../dc/d53/webm_2segmenter_8cc_source.html#l00255">segmenter.cc:255</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter_html"><div class="ttname"><a href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html">shaka::media::mp4::KeyRotationFragmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d22/key__rotation__fragmenter_8h_source.html#l00023">key_rotation_fragmenter.h:23</a></div></div>
@@ -601,7 +601,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 c87a67a7ef..99cc4dfa01 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1b2187e01f..d437c5f28d 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 9dcecad42d..4d1336c38a 100644
--- a/docs/d2/dae/webm__muxer_8cc_source.html
+++ b/docs/d2/dae/webm__muxer_8cc_source.html
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                  <span class="stringliteral">&quot;WebM does not support protection scheme other than &#39;cenc&#39;.&quot;</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;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  scoped_ptr&lt;MkvWriter&gt; writer(<span class="keyword">new</span> MkvWriter);</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  std::unique_ptr&lt;MkvWriter&gt; writer(<span class="keyword">new</span> MkvWriter);</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  Status status = writer-&gt;Open(options().output_file_name);</div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordflow">return</span> status;</div>
@@ -141,7 +141,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  Status initialized = segmenter_-&gt;Initialize(</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      writer.Pass(), streams()[0]-&gt;info().get(), progress_listener(),</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      std::move(writer), streams()[0]-&gt;info().<span class="keyword">get</span>(), progress_listener(),</div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      muxer_listener(), encryption_key_source(), max_sd_pixels(),</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;      clear_lead_in_seconds());</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1MuxerListener_html_ac89a028372db9abbccf569819d9b2b35"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#ac89a028372db9abbccf569819d9b2b35">shaka::media::MuxerListener::OnMediaEnd</a></div><div class="ttdeci">virtual void OnMediaEnd(bool has_init_range, uint64_t init_range_start, uint64_t init_range_end, bool has_index_range, uint64_t index_range_start, uint64_t index_range_end, float duration_seconds, uint64_t file_size)=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="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_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00180">file.cc:180</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00177">file.cc:177</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_1MuxerListener_html_a31536ec385a7ec22f323a42b872b499a"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a31536ec385a7ec22f323a42b872b499a">shaka::media::MuxerListener::OnMediaStart</a></div><div class="ttdeci">virtual void OnMediaStart(const MuxerOptions &amp;muxer_options, const StreamInfo &amp;stream_info, uint32_t time_scale, ContainerType container_type)=0</div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 5da3e491ae..22d8a7fffc 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 57f060766d..857de7b34c 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 b4628a6666..c3b57c0bc9 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9c78796eed..26c90c3990 100644
--- a/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html
+++ b/docs/d2/dba/classshaka_1_1media_1_1SegmentTestBase.html
@@ -129,11 +129,11 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>SetUp</b> () override
 <tr class="memitem:a67700a923bc280a351bcc3c310a284ef"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a67700a923bc280a351bcc3c310a284ef"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>TearDown</b> () override</td></tr>
 <tr class="separator:a67700a923bc280a351bcc3c310a284ef"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adbb73df6171a6caa80cf34c7d63c650d"><td class="memTemplParams" colspan="2"><a class="anchor" id="adbb73df6171a6caa80cf34c7d63c650d"></a>
+<tr class="memitem:a742824b930ae928f12214a5e350adc64"><td class="memTemplParams" colspan="2"><a class="anchor" id="a742824b930ae928f12214a5e350adc64"></a>
 template&lt;typename S &gt; </td></tr>
-<tr class="memitem:adbb73df6171a6caa80cf34c7d63c650d"><td class="memTemplItemLeft" align="right" valign="top">void&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">CreateAndInitializeSegmenter</a> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *key_source, scoped_ptr&lt; <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">webm::Segmenter</a> &gt; *result) const </td></tr>
-<tr class="memdesc:adbb73df6171a6caa80cf34c7d63c650d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates a Segmenter of the given type and initializes it. <br/></td></tr>
-<tr class="separator:adbb73df6171a6caa80cf34c7d63c650d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a742824b930ae928f12214a5e350adc64"><td class="memTemplItemLeft" align="right" valign="top">void&#160;</td><td class="memTemplItemRight" valign="bottom"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">CreateAndInitializeSegmenter</a> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *key_source, std::unique_ptr&lt; <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">webm::Segmenter</a> &gt; *result) const </td></tr>
+<tr class="memdesc:a742824b930ae928f12214a5e350adc64"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates a Segmenter of the given type and initializes it. <br/></td></tr>
+<tr class="separator:a742824b930ae928f12214a5e350adc64"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa6d43e2cc9d3abe023c037c87807f2ed"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa6d43e2cc9d3abe023c037c87807f2ed"></a>
 scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">CreateSample</a> (KeyFrameFlag key_frame_flag, uint64_t duration, SideDataFlag side_data_flag)</td></tr>
 <tr class="memdesc:aa6d43e2cc9d3abe023c037c87807f2ed"><td class="mdescLeft">&#160;</td><td class="mdescRight">Creates a new media sample. <br/></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 868f1d8436..9787ff617f 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9acf5259f9..c8d5c9d89a 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a919cc8c42..eeaac8cc6c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 5c16b4e232..543915c55d 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 989fea162c..99949d28f2 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
@@ -120,8 +120,8 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a40ef2af1da328cfdeefe37ef007146bb"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options)</td></tr>
 <tr class="separator:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
-<tr class="separator:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
+<tr class="separator:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a> ()</td></tr>
 <tr class="separator:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa15ccabe1a33c660201ef1d8386067e5 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
@@ -131,9 +131,9 @@ Public Member Functions</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pro-methods"></a>
 Protected Member Functions</h2></td></tr>
-<tr class="memitem:a443b4e0389582e75c1c85f10ad2b6b60"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a443b4e0389582e75c1c85f10ad2b6b60"></a>
-<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
-<tr class="separator:a443b4e0389582e75c1c85f10ad2b6b60"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a86d8e3616572f81fd3b55f96d3c5ae23"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a86d8e3616572f81fd3b55f96d3c5ae23"></a>
+<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
+<tr class="separator:a86d8e3616572f81fd3b55f96d3c5ae23"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:acae113e5a7e382042804f40c07bcc962"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acae113e5a7e382042804f40c07bcc962"></a>
 <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoFinalize</b> () override</td></tr>
 <tr class="separator:acae113e5a7e382042804f40c07bcc962"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -190,7 +190,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec<
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>An implementation of a <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a> for a multi-segment. Since this does not use seeking, it does not matter if the underlying files support seeking. </p>
 
-<p>Definition at line <a class="el" href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html#l00025">25</a> of file <a class="el" href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html">multi_segment_segmenter.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html#l00024">24</a> of file <a class="el" href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html">multi_segment_segmenter.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a75b572a055a0de68bf2809f61b319526"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 04f98fce41..eeb3adc4a7 100644
--- a/docs/d2/dd6/mkv__writer_8h_source.html
+++ b/docs/d2/dd6/mkv__writer_8h_source.html
@@ -96,9 +96,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_MKV_WRITER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_MKV_WRITER_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;string&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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/status.h&quot;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file_closer.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/third_party/libwebm/src/mkvmuxer.hpp&quot;</span></div>
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file() { <span class="keywordflow">return</span> file_.get(); }</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="keyword">private</span>:</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; file_;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; file_;</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="comment">// Keep track of the position and whether we can seek.</span></div>
 <div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  mkvmuxer::int64 position_;</div>
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">bool</span> seekable_;</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 024c17c10a..72784b9522 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 04ee6a7ef4..f7ca8e91d0 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d5a437378d..8f960639f4 100644
--- a/docs/d2/de6/packager__main_8cc_source.html
+++ b/docs/d2/de6/packager__main_8cc_source.html
@@ -253,446 +253,445 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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(scoped_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>),</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;        demuxer_(demuxer.Pass()) {}</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;  ~RemuxJob()<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    STLDeleteElements(&amp;muxers_);</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="keywordtype">void</span> AddMuxer(scoped_ptr&lt;Muxer&gt; mux) {</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    muxers_.push_back(mux.release());</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;  Demuxer* demuxer() { <span class="keywordflow">return</span> demuxer_.get(); }</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  Status status() { <span class="keywordflow">return</span> status_; }</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">private</span>:</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordtype">void</span> Run()<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    DCHECK(demuxer_);</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    status_ = demuxer_-&gt;Run();</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">  188</span>&#160;  scoped_ptr&lt;Demuxer&gt; demuxer_;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  std::vector&lt;Muxer*&gt; muxers_;</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  Status status_;</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;  DISALLOW_COPY_AND_ASSIGN(RemuxJob);</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;</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;<span class="keywordtype">bool</span> StreamInfoToTextMediaInfo(<span class="keyword">const</span> StreamDescriptor&amp; stream_descriptor,</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;                               <span class="keyword">const</span> MuxerOptions&amp; stream_muxer_options,</div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;                               MediaInfo* text_media_info) {</div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keyword">const</span> std::string&amp; language = stream_descriptor.language;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  std::string format = DetermineTextFileFormat(stream_descriptor.input);</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keywordflow">if</span> (format.empty()) {</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</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="l00202"></a><span class="lineno">  202</span>&#160;               &lt;&lt; stream_descriptor.input;</div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</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="l00207"></a><span class="lineno">  207</span>&#160;                  stream_muxer_options.output_file_name.c_str())) {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</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="l00209"></a><span class="lineno">  209</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="l00210"></a><span class="lineno">  210</span>&#160;               &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;  text_media_info-&gt;set_media_file_name(stream_muxer_options.output_file_name);</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  text_media_info-&gt;set_container_type(MediaInfo::CONTAINER_TEXT);</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="keywordflow">if</span> (stream_muxer_options.bandwidth != 0) {</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    text_media_info-&gt;set_bandwidth(stream_muxer_options.bandwidth);</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</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="l00221"></a><span class="lineno">  221</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="l00222"></a><span class="lineno">  222</span>&#160;    <span class="comment">// reasonable.</span></div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    text_media_info-&gt;set_bandwidth(256);</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;  MediaInfo::TextInfo* text_info = text_media_info-&gt;mutable_text_info();</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;  text_info-&gt;set_format(format);</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;  <span class="keywordflow">if</span> (!language.empty())</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    text_info-&gt;set_language(language);</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">return</span> <span class="keyword">true</span>;</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;scoped_ptr&lt;Muxer&gt; CreateOutputMuxer(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;                                    MediaContainerName container) {</div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;  <span class="keywordflow">if</span> (container == CONTAINER_WEBM) {</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;Muxer&gt;(<span class="keyword">new</span> webm::WebMMuxer(options));</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (container == CONTAINER_MPEG2TS) {</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp2t::TsMuxer(options));</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    DCHECK_EQ(container, CONTAINER_MOV);</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;Muxer&gt;(<span class="keyword">new</span> mp4::MP4Muxer(options));</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;</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;<span class="keywordtype">bool</span> CreateRemuxJobs(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors,</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;                     <span class="keyword">const</span> MuxerOptions&amp; muxer_options,</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;                     FakeClock* fake_clock,</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;                     KeySource* key_source,</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;                     MpdNotifier* mpd_notifier,</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;                     hls::HlsNotifier* hls_notifier,</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;                     std::vector&lt;RemuxJob*&gt;* remux_jobs) {</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  <span class="comment">// No notifiers OR (mpd_notifier XOR hls_notifier); which is NAND.</span></div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  DCHECK(!(mpd_notifier &amp;&amp; hls_notifier));</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  DCHECK(remux_jobs);</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;  std::string previous_input;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  <span class="keywordtype">int</span> stream_number = 0;</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;  <span class="keywordflow">for</span> (StreamDescriptorList::const_iterator</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;           stream_iter = stream_descriptors.begin();</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;       stream_iter != stream_descriptors.end();</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;       ++stream_iter, ++stream_number) {</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;    <span class="comment">// Process stream descriptor.</span></div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    MuxerOptions stream_muxer_options(muxer_options);</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    stream_muxer_options.output_file_name = stream_iter-&gt;output;</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;    <span class="keywordflow">if</span> (!stream_iter-&gt;segment_template.empty()) {</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      <span class="keywordflow">if</span> (!ValidateSegmentTemplate(stream_iter-&gt;segment_template)) {</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;        LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;ERROR: segment template with &#39;&quot;</span></div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</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="l00270"></a><span class="lineno">  270</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</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;      stream_muxer_options.segment_template = stream_iter-&gt;segment_template;</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;      <span class="keywordflow">if</span> (stream_muxer_options.single_segment) {</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</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="l00275"></a><span class="lineno">  275</span>&#160;                        <span class="stringliteral">&quot;setting single segment to false.&quot;</span>;</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;        stream_muxer_options.single_segment = <span class="keyword">false</span>;</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;    stream_muxer_options.bandwidth = stream_iter-&gt;bandwidth;</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="comment">// Handle text input.</span></div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</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="l00283"></a><span class="lineno">  283</span>&#160;      MediaInfo text_media_info;</div>
-<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;      <span class="keywordflow">if</span> (!StreamInfoToTextMediaInfo(*stream_iter, stream_muxer_options,</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;                                     &amp;text_media_info)) {</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> (mpd_notifier) {</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;        uint32 unused;</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;        <span class="keywordflow">if</span> (!mpd_notifier-&gt;NotifyNewContainer(text_media_info, &amp;unused)) {</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</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="l00293"></a><span class="lineno">  293</span>&#160;        } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;          mpd_notifier-&gt;Flush();</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">else</span> <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        <a class="code" href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html#ae0a573e1c785164f40bfbfba2ced6a16">VodMediaInfoDumpMuxerListener::WriteMediaInfoToFile</a>(</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;            text_media_info,</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;            stream_muxer_options.output_file_name + kMediaInfoSuffix);</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;        NOTIMPLEMENTED()</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;            &lt;&lt; <span class="stringliteral">&quot;--mpd_output or --output_media_info flags are &quot;</span></div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;               <span class="stringliteral">&quot;required for text output. Skipping manifest related output for &quot;</span></div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;            &lt;&lt; stream_iter-&gt;input;</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;      <span class="keywordflow">continue</span>;</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;    <span class="keywordflow">if</span> (stream_iter-&gt;input != previous_input) {</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      <span class="comment">// New remux job needed. Create demux and job thread.</span></div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;      scoped_ptr&lt;Demuxer&gt; demuxer(<span class="keyword">new</span> Demuxer(stream_iter-&gt;input));</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;      <span class="keywordflow">if</span> (FLAGS_enable_widevine_decryption ||</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;          FLAGS_enable_fixed_key_decryption) {</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;        scoped_ptr&lt;KeySource&gt; key_source(CreateDecryptionKeySource());</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;        <span class="keywordflow">if</span> (!key_source)</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;        demuxer-&gt;SetKeySource(key_source.Pass());</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;      Status status = demuxer-&gt;Initialize();</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;      <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</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="l00322"></a><span class="lineno">  322</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</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;      <span class="keywordflow">if</span> (FLAGS_dump_stream_info) {</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</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="l00326"></a><span class="lineno">  326</span>&#160;        DumpStreamInfo(demuxer-&gt;streams());</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;        <span class="keywordflow">if</span> (stream_iter-&gt;output.empty())</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;          <span class="keywordflow">continue</span>;  <span class="comment">// just need stream info.</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;      remux_jobs-&gt;push_back(<span class="keyword">new</span> RemuxJob(demuxer.Pass()));</div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;      previous_input = stream_iter-&gt;input;</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;    DCHECK(!remux_jobs-&gt;empty());</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;    scoped_ptr&lt;Muxer&gt; muxer(</div>
-<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;        CreateOutputMuxer(stream_muxer_options, stream_iter-&gt;output_format));</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</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="l00338"></a><span class="lineno">  338</span>&#160;</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;    <span class="keywordflow">if</span> (key_source) {</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;      muxer-&gt;SetKeySource(key_source,</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;                          FLAGS_max_sd_pixels,</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;                          FLAGS_clear_lead,</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;                          FLAGS_crypto_period_duration,</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;                          GetProtectionScheme(FLAGS_protection_scheme));</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;    scoped_ptr&lt;MuxerListener&gt; muxer_listener;</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    DCHECK(!(FLAGS_output_media_info &amp;&amp; mpd_notifier));</div>
-<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;    <span class="keywordflow">if</span> (FLAGS_output_media_info) {</div>
-<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;      <span class="keyword">const</span> std::string output_media_info_file_name =</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;          stream_muxer_options.output_file_name + kMediaInfoSuffix;</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;      scoped_ptr&lt;VodMediaInfoDumpMuxerListener&gt;</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;          vod_media_info_dump_muxer_listener(</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;              <span class="keyword">new</span> VodMediaInfoDumpMuxerListener(output_media_info_file_name));</div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;      muxer_listener = vod_media_info_dump_muxer_listener.Pass();</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;    <span class="keywordflow">if</span> (mpd_notifier) {</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;      scoped_ptr&lt;MpdNotifyMuxerListener&gt; mpd_notify_muxer_listener(</div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;          <span class="keyword">new</span> MpdNotifyMuxerListener(mpd_notifier));</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;      muxer_listener = mpd_notify_muxer_listener.Pass();</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;</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;    <span class="keywordflow">if</span> (hls_notifier) {</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</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="l00365"></a><span class="lineno">  365</span>&#160;      <span class="comment">// languages.</span></div>
-<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;      std::string group_id = stream_iter-&gt;hls_group_id;</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;      std::string name = stream_iter-&gt;hls_name;</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      std::string hls_playlist_name = stream_iter-&gt;hls_playlist_name;</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      <span class="keywordflow">if</span> (group_id.empty())</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;        group_id = <span class="stringliteral">&quot;audio&quot;</span>;</div>
-<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;      <span class="keywordflow">if</span> (name.empty())</div>
-<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;        name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d&quot;</span>, stream_number);</div>
-<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;      <span class="keywordflow">if</span> (hls_playlist_name.empty())</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;        hls_playlist_name = base::StringPrintf(<span class="stringliteral">&quot;stream_%d.m3u8&quot;</span>, stream_number);</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;      muxer_listener.reset(<span class="keyword">new</span> HlsNotifyMuxerListener(hls_playlist_name, name,</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160;                                                      group_id, hls_notifier));</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">  380</span>&#160;    <span class="keywordflow">if</span> (muxer_listener)</div>
-<div class="line"><a name="l00381"></a><span class="lineno">  381</span>&#160;      muxer-&gt;SetMuxerListener(muxer_listener.Pass());</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">if</span> (!AddStreamToMuxer(remux_jobs-&gt;back()-&gt;demuxer()-&gt;streams(),</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;                          stream_iter-&gt;stream_selector,</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;                          stream_iter-&gt;language,</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;                          muxer.get())) {</div>
-<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;    remux_jobs-&gt;back()-&gt;AddMuxer(muxer.Pass());</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;</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;Status RunRemuxJobs(<span class="keyword">const</span> std::vector&lt;RemuxJob*&gt;&amp; remux_jobs) {</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  <span class="comment">// Start the job threads.</span></div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</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="l00398"></a><span class="lineno">  398</span>&#160;       job_iter != remux_jobs.end();</div>
-<div class="line"><a name="l00399"></a><span class="lineno">  399</span>&#160;       ++job_iter) {</div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;    (*job_iter)-&gt;Start();</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;  <span class="comment">// Wait for all jobs to complete or an error occurs.</span></div>
-<div class="line"><a name="l00404"></a><span class="lineno">  404</span>&#160;  Status status;</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  <span class="keywordtype">bool</span> all_joined;</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  <span class="keywordflow">do</span> {</div>
-<div class="line"><a name="l00407"></a><span class="lineno">  407</span>&#160;    all_joined = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</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="l00409"></a><span class="lineno">  409</span>&#160;         job_iter != remux_jobs.end();</div>
-<div class="line"><a name="l00410"></a><span class="lineno">  410</span>&#160;         ++job_iter) {</div>
-<div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;      <span class="keywordflow">if</span> ((*job_iter)-&gt;HasBeenJoined()) {</div>
-<div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;        status = (*job_iter)-&gt;status();</div>
-<div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;        <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;          <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;      } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;        all_joined = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;        (*job_iter)-&gt;Join();</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;  } <span class="keywordflow">while</span> (!all_joined &amp;&amp; status.ok());</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;  <span class="keywordflow">return</span> status;</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;<span class="keywordtype">bool</span> RunPackager(<span class="keyword">const</span> StreamDescriptorList&amp; stream_descriptors) {</div>
-<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;  <span class="keyword">const</span> FourCC protection_scheme = GetProtectionScheme(FLAGS_protection_scheme);</div>
-<div class="line"><a name="l00427"></a><span class="lineno">  427</span>&#160;  <span class="keywordflow">if</span> (protection_scheme == FOURCC_NULL)</div>
-<div class="line"><a name="l00428"></a><span class="lineno">  428</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  <span class="keywordflow">if</span> (!AssignFlagsFromProfile())</div>
-<div class="line"><a name="l00431"></a><span class="lineno">  431</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;  <span class="keywordflow">if</span> (FLAGS_output_media_info &amp;&amp; !FLAGS_mpd_output.empty()) {</div>
-<div class="line"><a name="l00434"></a><span class="lineno">  434</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="l00435"></a><span class="lineno">  435</span>&#160;                        <span class="stringliteral">&quot;work together.&quot;</span>;</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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> (FLAGS_output_media_info &amp;&amp; !FLAGS_single_segment) {</div>
-<div class="line"><a name="l00439"></a><span class="lineno">  439</span>&#160;    <span class="comment">// TODO(rkuroiwa, kqyang): Support partial media info dump for live.</span></div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</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="l00441"></a><span class="lineno">  441</span>&#160;                        <span class="stringliteral">&quot;--single_segment is true.&quot;</span>;</div>
-<div class="line"><a name="l00442"></a><span class="lineno">  442</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00445"></a><span class="lineno">  445</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="l00446"></a><span class="lineno">  446</span>&#160;  <span class="comment">// disallow specifying both MPD and HLS flags.</span></div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</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="l00448"></a><span class="lineno">  448</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot output both MPD and HLS.&quot;</span>;</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;  <span class="comment">// Get basic muxer options.</span></div>
-<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;  MuxerOptions muxer_options;</div>
-<div class="line"><a name="l00454"></a><span class="lineno">  454</span>&#160;  <span class="keywordflow">if</span> (!GetMuxerOptions(&amp;muxer_options))</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  MpdOptions mpd_options;</div>
-<div class="line"><a name="l00458"></a><span class="lineno">  458</span>&#160;  <span class="keywordflow">if</span> (!GetMpdOptions(&amp;mpd_options))</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;</div>
-<div class="line"><a name="l00461"></a><span class="lineno">  461</span>&#160;  <span class="comment">// Create encryption key source if needed.</span></div>
-<div class="line"><a name="l00462"></a><span class="lineno">  462</span>&#160;  scoped_ptr&lt;KeySource&gt; encryption_key_source;</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;  <span class="keywordflow">if</span> (FLAGS_enable_widevine_encryption || FLAGS_enable_fixed_key_encryption) {</div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    encryption_key_source = CreateEncryptionKeySource();</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_source)</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  scoped_ptr&lt;MpdNotifier&gt; mpd_notifier;</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_mpd_output.empty()) {</div>
-<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;    DashProfile profile =</div>
-<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;        FLAGS_single_segment ? kOnDemandProfile : kLiveProfile;</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;    std::vector&lt;std::string&gt; base_urls;</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;    base::SplitString(FLAGS_base_urls, <span class="charliteral">&#39;,&#39;</span>, &amp;base_urls);</div>
-<div class="line"><a name="l00475"></a><span class="lineno">  475</span>&#160;    <span class="keywordflow">if</span> (FLAGS_generate_dash_if_iop_compliant_mpd) {</div>
-<div class="line"><a name="l00476"></a><span class="lineno">  476</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> DashIopMpdNotifier(profile, mpd_options, base_urls,</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;                                                FLAGS_mpd_output));</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;    } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;      mpd_notifier.reset(<span class="keyword">new</span> SimpleMpdNotifier(profile, mpd_options, base_urls,</div>
-<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;                                               FLAGS_mpd_output));</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">if</span> (!mpd_notifier-&gt;Init()) {</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;MpdNotifier failed to initialize.&quot;</span>;</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  scoped_ptr&lt;hls::HlsNotifier&gt; hls_notifier;</div>
-<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;  <span class="keywordflow">if</span> (!FLAGS_hls_master_playlist_output.empty()) {</div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;    base::FilePath master_playlist_path(</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;        base::FilePath::FromUTF8Unsafe(FLAGS_hls_master_playlist_output));</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;    base::FilePath master_playlist_name = master_playlist_path.BaseName();</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;    hls_notifier.reset(<span class="keyword">new</span> hls::SimpleHlsNotifier(</div>
-<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;        hls::HlsNotifier::HlsProfile::kOnDemandProfile, FLAGS_hls_base_url,</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;        master_playlist_path.DirName().AsEndingWithSeparator().AsUTF8Unsafe(),</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;        master_playlist_name.AsUTF8Unsafe()));</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;</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  std::vector&lt;RemuxJob*&gt; remux_jobs;</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  STLElementDeleter&lt;std::vector&lt;RemuxJob*&gt; &gt; scoped_jobs_deleter(&amp;remux_jobs);</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</span>&#160;  FakeClock fake_clock;</div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160;  <span class="keywordflow">if</span> (!CreateRemuxJobs(stream_descriptors, muxer_options, &amp;fake_clock,</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;                       encryption_key_source.get(), mpd_notifier.get(),</div>
-<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;                       hls_notifier.get(), &amp;remux_jobs)) {</div>
-<div class="line"><a name="l00506"></a><span class="lineno">  506</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  Status status = RunRemuxJobs(remux_jobs);</div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Packaging Error: &quot;</span> &lt;&lt; status.ToString();</div>
-<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  <span class="keywordflow">if</span> (hls_notifier) {</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</span>&#160;    <span class="keywordflow">if</span> (!hls_notifier-&gt;Flush())</div>
-<div class="line"><a name="l00517"></a><span class="lineno">  517</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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> (mpd_notifier) {</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160;    <span class="keywordflow">if</span> (!mpd_notifier-&gt;Flush())</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
-<div class="line"><a name="l00524"></a><span class="lineno">  524</span>&#160;  printf(<span class="stringliteral">&quot;Packaging completed successfully.\n&quot;</span>);</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</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="l00529"></a><span class="lineno">  529</span>&#160;  base::AtExitManager exit;</div>
-<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;  <span class="comment">// Needed to enable VLOG/DVLOG through --vmodule or --v.</span></div>
-<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;  base::CommandLine::Init(argc, argv);</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">// Set up logging.</span></div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;  logging::LoggingSettings log_settings;</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  base::FilePath log_filename;</div>
-<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;  PathService::Get(base::DIR_EXE, &amp;log_filename);</div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  log_filename = log_filename.AppendASCII(<span class="stringliteral">&quot;packager.log&quot;</span>);</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  log_settings.logging_dest = logging::LOG_TO_ALL;</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  log_settings.log_file = log_filename.value().c_str();</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  log_settings.delete_old = logging::DELETE_OLD_LOG_FILE;</div>
-<div class="line"><a name="l00541"></a><span class="lineno">  541</span>&#160;  CHECK(logging::InitLogging(log_settings));</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;  google::SetUsageMessage(base::StringPrintf(kUsage, argv[0]));</div>
-<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  google::ParseCommandLineFlags(&amp;argc, &amp;argv, <span class="keyword">true</span>);</div>
-<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;  <span class="keywordflow">if</span> (argc &lt; 2) {</div>
-<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;    <span class="keyword">const</span> std::string version_string = base::StringPrintf(</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;        <span class="stringliteral">&quot;shaka-packager version %s&quot;</span>, GetPackagerVersion().c_str());</div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;    google::ShowUsageWithFlags(version_string.c_str());</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;    <span class="keywordflow">return</span> kSuccess;</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;</div>
-<div class="line"><a name="l00552"></a><span class="lineno">  552</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="l00553"></a><span class="lineno">  553</span>&#160;    <span class="keywordflow">return</span> kArgumentValidationFailed;</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="keywordflow">if</span> (FLAGS_override_version)</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;    SetPackagerVersionForTesting(FLAGS_test_version);</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;  LibcryptoThreading libcrypto_threading;</div>
-<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  <span class="comment">// TODO(tinskip): Make InsertStreamDescriptor a member of</span></div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  <span class="comment">// StreamDescriptorList.</span></div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  StreamDescriptorList stream_descriptors;</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 1; i &lt; argc; ++i) {</div>
-<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;    <span class="keywordflow">if</span> (!InsertStreamDescriptor(argv[i], &amp;stream_descriptors))</div>
-<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;      <span class="keywordflow">return</span> kArgumentValidationFailed;</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="keywordflow">return</span> RunPackager(stream_descriptors) ? kSuccess : kPackagingFailed;</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;</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00570"></a><span class="lineno">  570</span>&#160;}  <span class="comment">// namespace shaka</span></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="preprocessor">#if defined(OS_WIN)</span></div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</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="l00574"></a><span class="lineno">  574</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="l00575"></a><span class="lineno">  575</span>&#160;  std::unique_ptr&lt;char* [], std::function&lt;void(char**)&gt;&gt; utf8_argv(</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</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="l00577"></a><span class="lineno">  577</span>&#160;        <span class="comment">// TODO(tinskip): This leaks, but if this code is enabled, it crashes.</span></div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;        <span class="comment">// Figure out why. I suspect gflags does something funny with the</span></div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;        <span class="comment">// argument array.</span></div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;        <span class="comment">// for (int idx = 0; idx &lt; argc; ++idx)</span></div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;        <span class="comment">//   delete[] utf8_args[idx];</span></div>
-<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;        <span class="keyword">delete</span>[] utf8_args;</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;  std::wstring_convert&lt;std::codecvt_utf8&lt;wchar_t&gt;&gt; converter;</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> idx = 0; idx &lt; argc; ++idx) {</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;    std::string utf8_arg(converter.to_bytes(argv[idx]));</div>
-<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;    utf8_arg += <span class="charliteral">&#39;\0&#39;</span>;</div>
-<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;    utf8_argv[idx] = <span class="keyword">new</span> <span class="keywordtype">char</span>[utf8_arg.size()];</div>
-<div class="line"><a name="l00589"></a><span class="lineno">  589</span>&#160;    memcpy(utf8_argv[idx], &amp;utf8_arg[0], utf8_arg.size());</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="keywordflow">return</span> shaka::media::PackagerMain(argc, utf8_argv.get());</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="preprocessor">#else</span></div>
-<div class="line"><a name="l00594"></a><span class="lineno">  594</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="l00595"></a><span class="lineno">  595</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, argv);</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="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#l00207">file.cc:207</a></div></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="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="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="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="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 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="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="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="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="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="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="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;</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160;    base::SplitString(FLAGS_base_urls, <span class="charliteral">&#39;,&#39;</span>, &amp;base_urls);</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="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="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="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;  base::FilePath log_filename;</div>
+<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160;  PathService::Get(base::DIR_EXE, &amp;log_filename);</div>
+<div class="line"><a name="l00536"></a><span class="lineno">  536</span>&#160;  log_filename = log_filename.AppendASCII(<span class="stringliteral">&quot;packager.log&quot;</span>);</div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;  log_settings.logging_dest = logging::LOG_TO_ALL;</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;  log_settings.log_file = log_filename.value().c_str();</div>
+<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;  log_settings.delete_old = logging::DELETE_OLD_LOG_FILE;</div>
+<div class="line"><a name="l00540"></a><span class="lineno">  540</span>&#160;  CHECK(logging::InitLogging(log_settings));</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;  google::SetUsageMessage(base::StringPrintf(kUsage, argv[0]));</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;  google::ParseCommandLineFlags(&amp;argc, &amp;argv, <span class="keyword">true</span>);</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</span>&#160;  <span class="keywordflow">if</span> (argc &lt; 2) {</div>
+<div class="line"><a name="l00545"></a><span class="lineno">  545</span>&#160;    <span class="keyword">const</span> std::string version_string = base::StringPrintf(</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;        <span class="stringliteral">&quot;shaka-packager version %s&quot;</span>, GetPackagerVersion().c_str());</div>
+<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;    google::ShowUsageWithFlags(version_string.c_str());</div>
+<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;    <span class="keywordflow">return</span> kSuccess;</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;  }</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> (!<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="l00552"></a><span class="lineno">  552</span>&#160;    <span class="keywordflow">return</span> kArgumentValidationFailed;</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> (FLAGS_override_version)</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;    SetPackagerVersionForTesting(FLAGS_test_version);</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;  LibcryptoThreading libcrypto_threading;</div>
+<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160;  <span class="comment">// TODO(tinskip): Make InsertStreamDescriptor a member of</span></div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;  <span class="comment">// StreamDescriptorList.</span></div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;  StreamDescriptorList stream_descriptors;</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 1; i &lt; argc; ++i) {</div>
+<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;    <span class="keywordflow">if</span> (!InsertStreamDescriptor(argv[i], &amp;stream_descriptors))</div>
+<div class="line"><a name="l00563"></a><span class="lineno">  563</span>&#160;      <span class="keywordflow">return</span> kArgumentValidationFailed;</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="keywordflow">return</span> RunPackager(stream_descriptors) ? kSuccess : kPackagingFailed;</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">// namespace media</span></div>
+<div class="line"><a name="l00569"></a><span class="lineno">  569</span>&#160;}  <span class="comment">// namespace shaka</span></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;<span class="preprocessor">#if defined(OS_WIN)</span></div>
+<div class="line"><a name="l00572"></a><span class="lineno">  572</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="l00573"></a><span class="lineno">  573</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="l00574"></a><span class="lineno">  574</span>&#160;  std::unique_ptr&lt;char* [], std::function&lt;void(char**)&gt;&gt; utf8_argv(</div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</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="l00576"></a><span class="lineno">  576</span>&#160;        <span class="comment">// TODO(tinskip): This leaks, but if this code is enabled, it crashes.</span></div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;        <span class="comment">// Figure out why. I suspect gflags does something funny with the</span></div>
+<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;        <span class="comment">// argument array.</span></div>
+<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;        <span class="comment">// for (int idx = 0; idx &lt; argc; ++idx)</span></div>
+<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;        <span class="comment">//   delete[] utf8_args[idx];</span></div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;        <span class="keyword">delete</span>[] utf8_args;</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;  std::wstring_convert&lt;std::codecvt_utf8&lt;wchar_t&gt;&gt; converter;</div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> idx = 0; idx &lt; argc; ++idx) {</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160;    std::string utf8_arg(converter.to_bytes(argv[idx]));</div>
+<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;    utf8_arg += <span class="charliteral">&#39;\0&#39;</span>;</div>
+<div class="line"><a name="l00587"></a><span class="lineno">  587</span>&#160;    utf8_argv[idx] = <span class="keyword">new</span> <span class="keywordtype">char</span>[utf8_arg.size()];</div>
+<div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;    memcpy(utf8_argv[idx], &amp;utf8_arg[0], utf8_arg.size());</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">return</span> shaka::media::PackagerMain(argc, utf8_argv.get());</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;<span class="preprocessor">#else</span></div>
+<div class="line"><a name="l00593"></a><span class="lineno">  593</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="l00594"></a><span class="lineno">  594</span>&#160;  <span class="keywordflow">return</span> shaka::media::PackagerMain(argc, argv);</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;<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#l00204">file.cc:204</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>
-<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#l00189">file.cc:189</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#l00186">file.cc:186</a></div></div>
 <div class="ttc" id="namespaceshaka_html_abc3f498491fb895860ebdee359935d93"><div class="ttname"><a href="../../d8/daf/namespaceshaka.html#abc3f498491fb895860ebdee359935d93">shaka::ValidateFixedCryptoFlags</a></div><div class="ttdeci">bool ValidateFixedCryptoFlags()</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3b/fixed__key__encryption__flags_8cc_source.html#l00033">fixed_key_encryption_flags.cc:33</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 cf899574c0..04ed480ba9 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b92c81267a..5a22b30ba7 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 ef7545114e..6b009c5228 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0cd72f73e0..a24f2446cb 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 aae465495e..ce71bd645f 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
@@ -102,13 +102,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Parse</b>(bool payload_unit_start_indicator, const uint8_t *buf, int size) override (defined in <a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a>)</td><td class="entry"><a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>Reset</b>() override (defined in <a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a>)</td><td class="entry"><a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SpecialPid</b> enum name (defined in <a class="el" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a>)</td><td class="entry"><a class="el" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>TsSectionPes</b>(scoped_ptr&lt; EsParser &gt; es_parser) (defined in <a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a>)</td><td class="entry"><a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>TsSectionPes</b>(std::unique_ptr&lt; EsParser &gt; es_parser) (defined in <a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a>)</td><td class="entry"><a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~TsSection</b>() (defined in <a class="el" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a>)</td><td class="entry"><a class="el" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~TsSectionPes</b>() override (defined in <a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a>)</td><td class="entry"><a class="el" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 3d12e1b2fb..49c80ea9c0 100644
--- a/docs/d2/dee/pes__packet__generator_8cc_source.html
+++ b/docs/d2/dee/pes__packet__generator_8cc_source.html
@@ -268,10 +268,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
-<div class="line"><a name="l00182"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">  182</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">PesPacketGenerator::SetEncryptionKey</a>(</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    scoped_ptr&lt;EncryptionKey&gt; encryption_key) {</div>
+<div class="line"><a name="l00182"></a><span class="lineno"><a class="line" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">  182</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">PesPacketGenerator::SetEncryptionKey</a>(</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key) {</div>
 <div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  <span class="keywordflow">if</span> (stream_type_ == kStreamVideo) {</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    scoped_ptr&lt;AesCbcEncryptor&gt; cbc(</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    std::unique_ptr&lt;AesCbcEncryptor&gt; cbc(</div>
 <div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;        <span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(CbcPaddingScheme::kNoPadding));</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> uint8_t kEncryptedBlocks = 1;</div>
@@ -279,7 +279,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    encryptor_.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>(</div>
 <div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;        kEncryptedBlocks, kClearBlocks,</div>
 <div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;        <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">AesPatternCryptor::kSkipIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;        AesCryptor::ConstantIvFlag::kUseConstantIv, cbc.Pass()));</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;        AesCryptor::ConstantIvFlag::kUseConstantIv, std::move(cbc)));</div>
 <div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (stream_type_ == kStreamAudio) {</div>
 <div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    encryptor_.reset(</div>
 <div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;        <span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(CbcPaddingScheme::kNoPadding,</div>
@@ -296,11 +296,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordflow">return</span> pes_packets_.size();</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="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">  210</a></span>&#160;scoped_ptr&lt;PesPacket&gt; <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">PesPacketGenerator::GetNextPesPacket</a>() {</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="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> scoped_ptr&lt;PesPacket&gt;(pes);</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="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>
@@ -311,16 +311,16 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;}  <span class="comment">// namespace media</span></div>
 <div class="line"><a name="l00223"></a><span class="lineno">  223</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_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#l00034">aes_pattern_cryptor.h:34</a></div></div>
+<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_1AACAudioSpecificConfig_html"><div class="ttname"><a href="../../d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html">shaka::media::AACAudioSpecificConfig</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d7e/aac__audio__specific__config_8h_source.html#l00023">aac_audio_specific_config.h:23</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a9834c58c732715a51c57a2a6385a761b"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">shaka::media::mp2t::PesPacketGenerator::GetNextPesPacket</a></div><div class="ttdeci">virtual scoped_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_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>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a346abd50baa9a1e6e42a49ba60f5f916"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">shaka::media::mp2t::PesPacketGenerator::SetEncryptionKey</a></div><div class="ttdeci">virtual bool SetEncryptionKey(scoped_ptr&lt; EncryptionKey &gt; encryption_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00182">pes_packet_generator.cc:182</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a27a700967eb692a8207fd5054263fc3a"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">shaka::media::mp2t::PesPacketGenerator::NumberOfReadyPesPackets</a></div><div class="ttdeci">virtual size_t NumberOfReadyPesPackets()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00206">pes_packet_generator.cc:206</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#l00078">aes_encryptor.h:78</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_1mp2t_1_1PesPacketGenerator_html_aa0346189f99b2f0fc2c71da1543155fa"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">shaka::media::mp2t::PesPacketGenerator::Initialize</a></div><div class="ttdeci">virtual bool Initialize(const StreamInfo &amp;stream)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00093">pes_packet_generator.cc:93</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00016">aes_pattern_cryptor.h:16</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00017">aes_pattern_cryptor.h:17</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacket_html"><div class="ttname"><a href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">shaka::media::mp2t::PesPacket</a></div><div class="ttdoc">Class that carries PES packet information. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d94/pes__packet_8h_source.html#l00020">pes_packet.h:20</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_acc603c661a6e0c592091b8bde5a77e3a"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">shaka::media::mp2t::PesPacketGenerator::SetEncryptionKey</a></div><div class="ttdeci">virtual bool SetEncryptionKey(std::unique_ptr&lt; EncryptionKey &gt; encryption_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00182">pes_packet_generator.cc:182</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_1AudioStreamInfo_html"><div class="ttname"><a href="../../da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html">shaka::media::AudioStreamInfo</a></div><div class="ttdoc">Holds audio stream information. </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d32/audio__stream__info_8h_source.html#l00018">audio_stream_info.h:18</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a72fdec2c03caf45fe447f61ecd4fd683"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">shaka::media::mp2t::PesPacketGenerator::PushSample</a></div><div class="ttdeci">virtual bool PushSample(scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00127">pes_packet_generator.cc:127</a></div></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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 15a2f6a753..b5b9977729 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
@@ -120,7 +120,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_count</b> () c
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d0/dee/segmenter__test__base_8h_source.html#l00079">79</a> of file <a class="el" href="../../d0/dee/segmenter__test__base_8h_source.html">segmenter_test_base.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d0/dee/segmenter__test__base_8h_source.html#l00080">80</a> of file <a class="el" href="../../d0/dee/segmenter__test__base_8h_source.html">segmenter_test_base.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="../../d0/dee/segmenter__test__base_8h_source.html">segmenter_test_base.h</a></li>
 <li>media/formats/webm/<a class="el" href="../../d4/da7/segmenter__test__base_8cc_source.html">segmenter_test_base.cc</a></li>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 d0fc3aabc2..b225ff1798 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 ce2451f891..ba87d799ac 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 edff893fb7..fb95f4df5d 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 c73ec9fe45..138711d4a7 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 1169a04994..2e6374922f 100644
--- a/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html
+++ b/docs/d3/d0a/classshaka_1_1media_1_1MediaParser.html
@@ -130,7 +130,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="../../d7/d12/media__parser_8h_source.html#l00026">26</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/d12/media__parser_8h_source.html#l00025">25</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
 </div><h2 class="groupheader">Member Typedef Documentation</h2>
 <a class="anchor" id="a95d25a50ad371304f1abce9971ce3704"></a>
 <div class="memitem">
@@ -149,7 +149,7 @@ Public Member Functions</h2></td></tr>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d7/d12/media__parser_8h_source.html#l00035">35</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/d12/media__parser_8h_source.html#l00034">34</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
 
 </div>
 </div>
@@ -172,7 +172,7 @@ Public Member Functions</h2></td></tr>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if the sample is accepted, false if something was wrong with the sample and a parsing error should be signaled. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d7/d12/media__parser_8h_source.html#l00044">44</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/d12/media__parser_8h_source.html#l00043">43</a> of file <a class="el" href="../../d7/d12/media__parser_8h_source.html">media_parser.h</a>.</p>
 
 </div>
 </div>
@@ -298,7 +298,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 bf427b1af7..858abcbfac 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bc92aced07..69aa5f750e 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 dd8d77b0cc..552781e623 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 18a5222c48..77eeeffab7 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 5a51f00fbd..6814b57c0b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 12d6eef586..e8c977557d 100644
--- a/docs/d3/d35/video__slice__header__parser_8cc_source.html
+++ b/docs/d3/d35/video__slice__header__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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 77f0ae26d2..dddd6a410a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 44e3eb323f..f03b56d441 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 32b9ad6256..6d1543c7fd 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 14d0a8188e..7ac6fb2c3a 100644
--- a/docs/d3/d61/classshaka_1_1media_1_1File.html
+++ b/docs/d3/d61/classshaka_1_1media_1_1File.html
@@ -195,7 +195,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
   </tr>
 </table>
 </div><div class="memdoc">
-<p>Do <em>not</em> call the destructor directly (with the "delete" keyword) nor use scoped_ptr; instead use <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close()</a>. </p>
+<p>Do <em>not</em> call the destructor directly (with the "delete" keyword) nor use std::unique_ptr; instead use <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close()</a>. </p>
 
 <p>Definition at line <a class="el" href="../../d2/d4d/file_8h_source.html#l00132">132</a> of file <a class="el" href="../../d2/d4d/file_8h_source.html">file.h</a>.</p>
 
@@ -270,7 +270,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00207">207</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00204">204</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -315,7 +315,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>Number of bytes written, or a value &lt; 0 on error. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00236">236</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00233">233</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -367,7 +367,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>Number of bytes written, or a value &lt; 0 on error. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00240">240</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00237">237</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -401,7 +401,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true if successful, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00167">167</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00164">164</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -481,7 +481,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </div><div class="memdoc">
 <dl class="section return"><dt>Returns</dt><dd>The size of a file in bytes on success, a value &lt; 0 otherwise. The file will be opened and closed in the process. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00180">180</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00177">177</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -526,7 +526,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>A <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html" title="Define an abstract file interface. ">File</a> pointer on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00145">145</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00142">142</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -571,7 +571,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>A <a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html" title="Define an abstract file interface. ">File</a> pointer on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00156">156</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00153">153</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -661,7 +661,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>ThreadedIoFile</b></
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>true on success, false otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00189">189</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d5/dfc/file_8cc_source.html#l00186">186</a> of file <a class="el" href="../../d5/dfc/file_8cc_source.html">file.cc</a>.</p>
 
 </div>
 </div>
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 3e35be4acc..3ce38c9aaa 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 8c24797d68..bc54208f5b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 0e04798047..b0742bdf77 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 69d08a44ec..a856285984 100644
--- a/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html
+++ b/docs/d3/d67/classshaka_1_1media_1_1WebMVideoClient.html
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 cd90ac166f..a71d462810 100644
--- a/docs/d3/d6b/fixed__key__source_8cc_source.html
+++ b/docs/d3/d6b/fixed__key__source_8cc_source.html
@@ -172,38 +172,38 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">   86</a></span>&#160;scoped_ptr&lt;FixedKeySource&gt; <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">FixedKeySource::CreateFromHexStrings</a>(</div>
+<div class="line"><a name="l00086"></a><span class="lineno"><a class="line" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">   86</a></span>&#160;std::unique_ptr&lt;FixedKeySource&gt; <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">FixedKeySource::CreateFromHexStrings</a>(</div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    <span class="keyword">const</span> std::string&amp; key_id_hex,</div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="keyword">const</span> std::string&amp; key_hex,</div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keyword">const</span> std::string&amp; pssh_boxes_hex,</div>
 <div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keyword">const</span> std::string&amp; iv_hex) {</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</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;  <span class="keywordflow">if</span> (!base::HexStringToBytes(key_id_hex, &amp;encryption_key-&gt;key_id)) {</div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot parse key_id_hex &quot;</span> &lt;&lt; key_id_hex;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;();</div>
 <div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (encryption_key-&gt;key_id.size() != 16) {</div>
 <div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Invalid key ID size &#39;&quot;</span> &lt;&lt; encryption_key-&gt;key_id.size()</div>
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;               &lt;&lt; <span class="stringliteral">&quot;&#39;, must be 16 bytes.&quot;</span>;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;();</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">  102</span>&#160;  <span class="keywordflow">if</span> (!base::HexStringToBytes(key_hex, &amp;encryption_key-&gt;key)) {</div>
 <div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot parse key_hex &quot;</span> &lt;&lt; key_hex;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;();</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;  std::vector&lt;uint8_t&gt; pssh_boxes;</div>
 <div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordflow">if</span> (!pssh_boxes_hex.empty() &amp;&amp;</div>
 <div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;      !base::HexStringToBytes(pssh_boxes_hex, &amp;pssh_boxes)) {</div>
 <div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot parse pssh_hex &quot;</span> &lt;&lt; pssh_boxes_hex;</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;();</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> (!iv_hex.empty()) {</div>
 <div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    <span class="keywordflow">if</span> (!base::HexStringToBytes(iv_hex, &amp;encryption_key-&gt;iv)) {</div>
 <div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Cannot parse iv_hex &quot;</span> &lt;&lt; iv_hex;</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;();</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;  }</div>
 <div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
@@ -211,7 +211,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;          pssh_boxes.data(), pssh_boxes.size(),</div>
 <div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;          &amp;encryption_key-&gt;key_system_info)) {</div>
 <div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;--pssh argument should be full PSSH boxes.&quot;</span>;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;();</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&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;</div>
 <div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="comment">// If there aren&#39;t any PSSH boxes given, create one with the common system ID.</span></div>
@@ -224,20 +224,21 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    encryption_key-&gt;key_system_info.push_back(info);</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;  <span class="keywordflow">return</span> scoped_ptr&lt;FixedKeySource&gt;(<span class="keyword">new</span> <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>(encryption_key.Pass()));</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;FixedKeySource::FixedKeySource() {}</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;FixedKeySource::FixedKeySource(scoped_ptr&lt;EncryptionKey&gt; key)</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    : encryption_key_(key.Pass()) {}</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a091b4ea22419b73f8532db862f985f99"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">shaka::media::FixedKeySource::CreateFromHexStrings</a></div><div class="ttdeci">static scoped_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#l00086">fixed_key_source.cc:86</a></div></div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordflow">return</span> std::unique_ptr&lt;FixedKeySource&gt;(</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;      <span class="keyword">new</span> <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>(std::move(encryption_key)));</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;FixedKeySource::FixedKeySource() {}</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;FixedKeySource::FixedKeySource(std::unique_ptr&lt;EncryptionKey&gt; key)</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    : encryption_key_(std::move(key)) {}</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 media</span></div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a358b0955ecec61e6ce23611e2772265b"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a358b0955ecec61e6ce23611e2772265b">shaka::media::FixedKeySource::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="../../d3/d6b/fixed__key__source_8cc_source.html#l00017">fixed_key_source.cc:17</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#l00086">fixed_key_source.cc:86</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ProtectionSystemSpecificInfo_html_aa984e27d2655a451ea87ff0a4ddd8b79"><div class="ttname"><a href="../../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#aa984e27d2655a451ea87ff0a4ddd8b79">shaka::media::ProtectionSystemSpecificInfo::ParseBoxes</a></div><div class="ttdeci">static bool ParseBoxes(const uint8_t *data, size_t data_size, std::vector&lt; ProtectionSystemSpecificInfo &gt; *pssh_boxes)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/d42/protection__system__specific__info_8cc_source.html#l00025">protection_system_specific_info.cc:25</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></div><div class="ttdoc">A key source that uses fixed keys for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d72/fixed__key__source_8h_source.html#l00027">fixed_key_source.h: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#l00020">key_source.h:20</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_1FixedKeySource_html_a267d1f36d1c015fd5e8c20b93f270d0a"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a267d1f36d1c015fd5e8c20b93f270d0a">shaka::media::FixedKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d6b/fixed__key__source_8cc_source.html#l00033">fixed_key_source.cc: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>
@@ -245,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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 930dd567aa..00e6366dfa 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
@@ -126,10 +126,10 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <tr class="separator:adc96fbcd6a4d4ba9845f8d00974ace0f inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Cancel</a> ()</td></tr>
 <tr class="separator:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a> (scoped_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
-<tr class="separator:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a> (scoped_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
-<tr class="separator:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a> (std::unique_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
+<tr class="separator:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a> (std::unique_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
+<tr class="separator:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0a1451c6277554ad1956225a345f5d3d"></a>
 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"><b>streams</b> () const </td></tr>
 <tr class="separator:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 9a1b3f0066..d7daf4614b 100644
--- a/docs/d3/d72/fixed__key__source_8h_source.html
+++ b/docs/d3/d72/fixed__key__source_8h_source.html
@@ -96,10 +96,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_BASE_FIXED_KEY_SOURCE_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_FIXED_KEY_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;string&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/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/key_source.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>
@@ -127,7 +127,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                            TrackType track_type,</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                            <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">static</span> scoped_ptr&lt;FixedKeySource&gt; <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">CreateFromHexStrings</a>(</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">static</span> std::unique_ptr&lt;FixedKeySource&gt; <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">CreateFromHexStrings</a>(</div>
 <div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;      <span class="keyword">const</span> std::string&amp; key_id_hex,</div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      <span class="keyword">const</span> std::string&amp; key_hex,</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;      <span class="keyword">const</span> std::string&amp; pssh_boxes_hex,</div>
@@ -138,9 +138,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>();</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">private</span>:</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>(scoped_ptr&lt;EncryptionKey&gt; key);</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>(std::unique_ptr&lt;EncryptionKey&gt; 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;  scoped_ptr&lt;EncryptionKey&gt; encryption_key_;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; encryption_key_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">FixedKeySource</a>);</div>
 <div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;};</div>
@@ -149,18 +149,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_BASE_FIXED_KEY_SOURCE_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a091b4ea22419b73f8532db862f985f99"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">shaka::media::FixedKeySource::CreateFromHexStrings</a></div><div class="ttdeci">static scoped_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#l00086">fixed_key_source.cc:86</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html_a358b0955ecec61e6ce23611e2772265b"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a358b0955ecec61e6ce23611e2772265b">shaka::media::FixedKeySource::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="../../d3/d6b/fixed__key__source_8cc_source.html#l00017">fixed_key_source.cc:17</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#l00086">fixed_key_source.cc:86</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1FixedKeySource_html"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></div><div class="ttdoc">A key source that uses fixed keys for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d72/fixed__key__source_8h_source.html#l00027">fixed_key_source.h: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#l00020">key_source.h:20</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_1FixedKeySource_html_a267d1f36d1c015fd5e8c20b93f270d0a"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a267d1f36d1c015fd5e8c20b93f270d0a">shaka::media::FixedKeySource::GetKey</a></div><div class="ttdeci">Status GetKey(TrackType track_type, EncryptionKey *key) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d6b/fixed__key__source_8cc_source.html#l00033">fixed_key_source.cc: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_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#l00031">key_source.h:31</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_1FixedKeySource_html_afa9abf3a9104cbcb4711eac65c8a5bdf"><div class="ttname"><a href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#afa9abf3a9104cbcb4711eac65c8a5bdf">shaka::media::FixedKeySource::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="../../d3/d6b/fixed__key__source_8cc_source.html#l00054">fixed_key_source.cc:54</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6dd3177f77..07bbde73b4 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
@@ -130,10 +130,10 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <tr class="separator:adc96fbcd6a4d4ba9845f8d00974ace0f inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Cancel</a> ()</td></tr>
 <tr class="separator:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a> (scoped_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
-<tr class="separator:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a> (scoped_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
-<tr class="separator:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a> (std::unique_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
+<tr class="separator:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a> (std::unique_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
+<tr class="separator:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0a1451c6277554ad1956225a345f5d3d"></a>
 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"><b>streams</b> () const </td></tr>
 <tr class="separator:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 bf1f037bb2..5260aeba53 100644
--- a/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html
+++ b/docs/d3/d75/classshaka_1_1media_1_1AesEncryptor.html
@@ -154,7 +154,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00022">22</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00021">21</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a873b0794baca91b36dbc484fc9c37e58"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 99a929cb7f..72bcdffe18 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 14092a2a5c..7747ec9d46 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 04890e4f34..ad2e77ae33 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 1e7e988987..2d190ccdc3 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f46ebb76b7..12d1e1d92a 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a0be2cf8f2..08b31e97da 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d427186c9d..30645d917c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 8683164907..11af56dff4 100644
--- a/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html
+++ b/docs/d3/d8b/structshaka_1_1media_1_1FileCloser.html
@@ -103,7 +103,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>operator()</b> (<a cl
 <tr class="separator:a0cbcf8ffbe5f85ddcaeb74ac2e8d8438"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
-<div class="textblock"><p>Used by scoped_ptr to automatically close the file when it goes out of scope. </p>
+<div class="textblock"><p>Used by std::unique_ptr to automatically close the file when it goes out of scope. </p>
 
 <p>Definition at line <a class="el" href="../../de/dcf/file__closer_8h_source.html#l00018">18</a> of file <a class="el" href="../../de/dcf/file__closer_8h_source.html">file_closer.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 4be97a7c17..de5a7daa7d 100644
--- a/docs/d3/d8d/webm__audio__client_8h_source.html
+++ b/docs/d3/d8d/webm__audio__client_8h_source.html
@@ -94,10 +94,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
-<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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></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 &quot;packager/media/base/audio_stream_info.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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0d7cd5a6e4..23bca853ae 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 a6f686fda4..cfee6da13f 100644
--- a/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html
+++ b/docs/d3/d91/classshaka_1_1media_1_1H264Parser.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 02ece1a2e1..b243a6f803 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 dcf53880ec..c7ce5bbd18 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
@@ -121,8 +121,8 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a40ef2af1da328cfdeefe37ef007146bb"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options)</td></tr>
 <tr class="separator:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
-<tr class="separator:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
+<tr class="separator:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a> ()</td></tr>
 <tr class="separator:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa15ccabe1a33c660201ef1d8386067e5 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
@@ -144,12 +144,12 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_index_start</b> (
 <tr class="memitem:a4111e941d518e7736f98584f2ece4707"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4111e941d518e7736f98584f2ece4707"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>set_index_end</b> (uint64_t end)</td></tr>
 <tr class="separator:a4111e941d518e7736f98584f2ece4707"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a77f91bf80fd6fe31290c6f7ed3f45f0d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a77f91bf80fd6fe31290c6f7ed3f45f0d"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>set_writer</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)</td></tr>
-<tr class="separator:a77f91bf80fd6fe31290c6f7ed3f45f0d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa14cc579f75b5ea79155fda5208c227c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa14cc579f75b5ea79155fda5208c227c"></a>
-<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
-<tr class="separator:aa14cc579f75b5ea79155fda5208c227c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7060ebeb3b41bd5c3c646b14a4d67743"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7060ebeb3b41bd5c3c646b14a4d67743"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>set_writer</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)</td></tr>
+<tr class="separator:a7060ebeb3b41bd5c3c646b14a4d67743"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9652235e591aa97abaabd2688455ae0b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9652235e591aa97abaabd2688455ae0b"></a>
+<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
+<tr class="separator:a9652235e591aa97abaabd2688455ae0b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5e2b706367b080837035c8baefbb0087"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5e2b706367b080837035c8baefbb0087"></a>
 <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoFinalize</b> () override</td></tr>
 <tr class="separator:a5e2b706367b080837035c8baefbb0087"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f7308feb65..215b411bda 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 6f8e1d3260..dcdf3f5ed7 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d17705c534..fe57c52d3c 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 ffde11776d..143f3b6dd0 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 e7eae3dfe0..f73485d024 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 626a1b0381..113f03f2d6 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 957cea1a46..690a75dc32 100644
--- a/docs/d3/dbe/demuxer_8cc_source.html
+++ b/docs/d3/dbe/demuxer_8cc_source.html
@@ -138,8 +138,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#acad9afa8ef3b5682324a4ded402ab93a">   52</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">Demuxer::SetKeySource</a>(scoped_ptr&lt;KeySource&gt; key_source) {</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  key_source_ = key_source.Pass();</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>
@@ -324,28 +324,28 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="ttc" id="classshaka_1_1media_1_1Demuxer_html_acad9afa8ef3b5682324a4ded402ab93a"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(scoped_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_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_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_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#l00031">mp2t_media_parser.h:31</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_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_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#l00033">mp4_media_parser.h:33</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 53ecdfb1b0..113f0370b0 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 18c1e8d445..336348280d 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
@@ -126,7 +126,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../db/d51/mp2t__media__parser_8h_source.html#l00031">31</a> of file <a class="el" href="../../db/d51/mp2t__media__parser_8h_source.html">mp2t_media_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../db/d51/mp2t__media__parser_8h_source.html#l00030">30</a> of file <a class="el" href="../../db/d51/mp2t__media__parser_8h_source.html">mp2t_media_parser.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="afdb1a88116e3347e67afeb7715847135"></a>
 <div class="memitem">
@@ -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#l00171">171</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#l00173">173</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#l00158">158</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#l00160">160</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#l00190">190</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#l00192">192</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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 99540606e0..b1f0857dd8 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 0741b7d04d..13da83d802 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 8f9a8579df..9c02656314 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6cf2e7e881..5343de9d35 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 40099ac26f..8edc80a28b 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 90ff55fcf8..152d21ec08 100644
--- a/docs/d3/df1/box__reader_8cc_source.html
+++ b/docs/d3/df1/box__reader_8cc_source.html
@@ -96,9 +96,9 @@ 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 &lt;inttypes.h&gt;</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;limits&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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&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/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/formats/mp4/box.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
@@ -126,7 +126,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00037"></a><span class="lineno"><a class="line" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#ae348922875d67128d2af6d88b692e205">   37</a></span>&#160;<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">BoxReader</a>* <a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#ae348922875d67128d2af6d88b692e205">BoxReader::ReadBox</a>(<span class="keyword">const</span> uint8_t* buf,</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                              <span class="keyword">const</span> <span class="keywordtype">size_t</span> buf_size,</div>
 <div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                              <span class="keywordtype">bool</span>* err) {</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  scoped_ptr&lt;BoxReader&gt; reader(<span class="keyword">new</span> <a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">BoxReader</a>(buf, buf_size));</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  std::unique_ptr&lt;BoxReader&gt; reader(<span class="keyword">new</span> <a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">BoxReader</a>(buf, buf_size));</div>
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordflow">if</span> (!reader-&gt;ReadHeader(err))</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
@@ -159,7 +159,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  scanned_ = <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;  <span class="keywordflow">while</span> (pos() &lt; size()) {</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    scoped_ptr&lt;BoxReader&gt; child(</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    std::unique_ptr&lt;BoxReader&gt; child(</div>
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        <span class="keyword">new</span> <a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">BoxReader</a>(&amp;data()[pos()], size() - pos()));</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="keywordtype">bool</span> err;</div>
 <div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    <span class="keywordflow">if</span> (!child-&gt;ReadHeader(&amp;err))</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 fb7cab8c10..e3d1f8df31 100644
--- a/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html
+++ b/docs/d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html
@@ -123,8 +123,8 @@ Public Types</h2></td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ad76aebd0a9f7cc78f6f841cbce359107"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">AesPatternCryptor</a> (uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode, ConstantIvFlag constant_iv_flag, scoped_ptr&lt; <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> &gt; cryptor)</td></tr>
-<tr class="separator:ad76aebd0a9f7cc78f6f841cbce359107"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:abb94f2d6a527b12854e81839fd10e1d5"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">AesPatternCryptor</a> (uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode, ConstantIvFlag constant_iv_flag, std::unique_ptr&lt; <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> &gt; cryptor)</td></tr>
+<tr class="separator:abb94f2d6a527b12854e81839fd10e1d5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">AesCryptor implementation overrides.</div></td></tr>
 <tr class="memitem:af878688f0f277f3f6757e85654439c34"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">InitializeWithIv</a> (const std::vector&lt; uint8_t &gt; &amp;key, const std::vector&lt; uint8_t &gt; &amp;<a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>) override</td></tr>
 <tr class="separator:af878688f0f277f3f6757e85654439c34"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -167,7 +167,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Implements pattern-based encryption/decryption. </p>
 
-<p>Definition at line <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00016">16</a> of file <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html">aes_pattern_cryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00017">17</a> of file <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html">aes_pattern_cryptor.h</a>.</p>
 </div><h2 class="groupheader">Member Enumeration Documentation</h2>
 <a class="anchor" id="a54fd35d7782d3b4948c7eb68387711f0"></a>
 <div class="memitem">
@@ -188,12 +188,12 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </td></tr>
 </table>
 
-<p>Definition at line <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00020">20</a> of file <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html">aes_pattern_cryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00021">21</a> of file <a class="el" href="../../d6/d09/aes__pattern__cryptor_8h_source.html">aes_pattern_cryptor.h</a>.</p>
 
 </div>
 </div>
 <h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="ad76aebd0a9f7cc78f6f841cbce359107"></a>
+<a class="anchor" id="abb94f2d6a527b12854e81839fd10e1d5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -224,7 +224,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> &gt;&#160;</td>
           <td class="paramname"><em>cryptor</em>&#160;</td>
         </tr>
         <tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 bbe9ed994d..d71bc194b9 100644
--- a/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html
+++ b/docs/d4/d00/mp4_2multi__segment__segmenter_8cc_source.html
@@ -110,9 +110,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">namespace </span>mp4 {</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;MultiSegmentSegmenter::MultiSegmentSegmenter(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                                             scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                                             scoped_ptr&lt;Movie&gt; moov)</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    : Segmenter(options, ftyp.Pass(), moov.Pass()),</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                                             std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                                             std::unique_ptr&lt;Movie&gt; moov)</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    : Segmenter(options, std::move(ftyp), std::move(moov)),</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;      styp_(new SegmentType),</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;      num_segments_(0) {</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="comment">// Use the same brands for styp as ftyp.</span></div>
@@ -142,7 +142,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00053"></a><span class="lineno">   53</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="l00054"></a><span class="lineno">   54</span>&#160;                  <span class="stringliteral">&quot;Cannot open file for write &quot;</span> + options().output_file_name);</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;  scoped_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> <a class="code" href="../../dc/d41/classshaka_1_1media_1_1BufferWriter.html">BufferWriter</a>);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  std::unique_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> <a class="code" href="../../dc/d41/classshaka_1_1media_1_1BufferWriter.html">BufferWriter</a>);</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  ftyp()-&gt;<a class="code" href="../../d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html#a15bd0622fdb129d921287e690f117bde">Write</a>(buffer.get());</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  moov()-&gt;<a class="code" href="../../d1/d2d/structshaka_1_1media_1_1mp4_1_1Box.html#a15bd0622fdb129d921287e690f117bde">Write</a>(buffer.get());</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = buffer-&gt;WriteToFile(file);</div>
@@ -224,7 +224,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  DCHECK(fragment_buffer());</div>
 <div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  DCHECK(styp_);</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;  scoped_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> BufferWriter());</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  std::unique_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> BufferWriter());</div>
 <div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  File* file;</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  std::string file_name;</div>
 <div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordflow">if</span> (options().segment_template.empty()) {</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 2747b72ab6..a3c752b1a9 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 5655b18b36..a5968e46ed 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d641e01f0a..7c7e2db65f 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 99f2988415..db9e74706c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 e876aeecf0..ba96c05936 100644
--- a/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html
+++ b/docs/d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html
@@ -158,7 +158,7 @@ AES_KEY *&#160;</td><td class="memItemRight" valign="bottom"><b>mutable_aes_key<
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00078">78</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html#l00077">77</a> of file <a class="el" href="../../d1/df0/aes__encryptor_8h_source.html">aes_encryptor.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a2cc8f20b92d884d959b3a586b527fece"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 12c50a384d..1c02f4de94 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 5857ffb946..0fcf93959a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 1228552e73..4884ccf6a1 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 3a4077c158..e6ce43b311 100644
--- a/docs/d4/d37/io__cache_8cc_source.html
+++ b/docs/d4/d37/io__cache_8cc_source.html
@@ -252,7 +252,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 693ecc83c3..898c2f8c6e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 c91d54cb3e..7f45de3498 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 71ad8318ab..af8ff1f6c7 100644
--- a/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html
+++ b/docs/d4/d4c/structshaka_1_1media_1_1H264WeightingFactors.html
@@ -124,7 +124,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>chroma_offset</b> [32]
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 88a4d20dd6..fc73376fe9 100644
--- a/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html
+++ b/docs/d4/d58/classshaka_1_1media_1_1Nalu-members.html
@@ -157,7 +157,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 54b2df2d8e..b0f01ead5a 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 8eec90e11c..ae192daf8d 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 32f0d7be01..e1675311e6 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 517de9cf09..7ffd64dbb4 100644
--- a/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html
+++ b/docs/d4/d70/classshaka_1_1DashIopMpdNotifier.html
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3f7162ef67..8bc2d41d38 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3a73712dea..2aab4f0122 100644
--- a/docs/d4/d87/nalu__reader_8h_source.html
+++ b/docs/d4/d87/nalu__reader_8h_source.html
@@ -297,7 +297,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 419f0d17c9..47a2a35db3 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 5dbb7c1dae..2ad2240797 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 056132e740..fed3f228ed 100644
--- a/docs/d4/da7/segmenter__test__base_8cc_source.html
+++ b/docs/d4/da7/segmenter__test__base_8cc_source.html
@@ -298,7 +298,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_ace8082bd6dcd3aa07177c648f6ad7ecf"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#ace8082bd6dcd3aa07177c648f6ad7ecf">shaka::media::SegmentTestBase::OutputFileName</a></div><div class="ttdeci">std::string OutputFileName() const </div><div class="ttdoc">Gets the file name of the current output file. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00101">segmenter_test_base.cc:101</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_aa6d43e2cc9d3abe023c037c87807f2ed"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">shaka::media::SegmentTestBase::CreateSample</a></div><div class="ttdeci">scoped_refptr&lt; MediaSample &gt; CreateSample(KeyFrameFlag key_frame_flag, uint64_t duration, SideDataFlag side_data_flag)</div><div class="ttdoc">Creates a new media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00056">segmenter_test_base.cc:56</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>
-<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#l00189">file.cc:189</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#l00186">file.cc:186</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a872d1150a71d9f0fb5db0ab81334d614"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a872d1150a71d9f0fb5db0ab81334d614">shaka::media::MuxerOptions::temp_dir</a></div><div class="ttdeci">std::string temp_dir</div><div class="ttdoc">Specify temporary directory for intermediate files. </div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00071">muxer_options.h:71</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1SegmentTestBase_html_a89d5ae5a78134e108a4fe4adb6f79e4e"><div class="ttname"><a href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">shaka::media::SegmentTestBase::CreateMuxerOptions</a></div><div class="ttdeci">MuxerOptions CreateMuxerOptions() const </div><div class="ttdoc">Creates a Muxer options object for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/da7/segmenter__test__base_8cc_source.html#l00079">segmenter_test_base.cc:79</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1MuxerOptions_html_a15e22454ac119d191ef0adbc8b4965ab"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a15e22454ac119d191ef0adbc8b4965ab">shaka::media::MuxerOptions::single_segment</a></div><div class="ttdeci">bool single_segment</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00024">muxer_options.h:24</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 28ebd8e0a4..3c63185e16 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 4ffdf9b347..3af607d9ad 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 20b1a73f83..e968504036 100644
--- a/docs/d4/db2/cluster__builder_8h_source.html
+++ b/docs/d4/db2/cluster__builder_8h_source.html
@@ -95,91 +95,93 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&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="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"><a class="line" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">   14</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> {</div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;  <a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>(scoped_ptr&lt;uint8_t[]&gt; data, <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;  ~<a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>();</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">const</span> uint8_t* data()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.get(); }</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  <span class="keywordtype">int</span> size()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> size_; }</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">private</span>:</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  scoped_ptr&lt;uint8_t[]&gt; data_;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keywordtype">int</span> size_;</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;  DISALLOW_IMPLICIT_CONSTRUCTORS(<a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>);</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"><a class="line" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">   29</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</a> {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</a>();</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  ~<a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</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;  <span class="keywordtype">void</span> SetClusterTimecode(int64_t cluster_timecode);</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordtype">void</span> AddSimpleBlock(<span class="keywordtype">int</span> track_num,</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;                      int64_t timecode,</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;                      <span class="keywordtype">int</span> flags,</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                      <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                      <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">void</span> AddBlockGroup(<span class="keywordtype">int</span> track_num,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                     int64_t timecode,</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                     <span class="keywordtype">int</span> duration,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                     <span class="keywordtype">int</span> flags,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                     <span class="keywordtype">bool</span> is_key_frame,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                     <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                     <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordtype">void</span> AddBlockGroupWithoutBlockDuration(<span class="keywordtype">int</span> track_num,</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                         int64_t timecode,</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                                         <span class="keywordtype">int</span> flags,</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                                         <span class="keywordtype">bool</span> is_key_frame,</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                         <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                                         <span class="keywordtype">int</span> size);</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;  scoped_ptr&lt;Cluster&gt; Finish();</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  scoped_ptr&lt;Cluster&gt; FinishWithUnknownSize();</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="keyword">private</span>:</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="keywordtype">void</span> AddBlockGroupInternal(<span class="keywordtype">int</span> track_num,</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                             int64_t timecode,</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                             <span class="keywordtype">bool</span> include_block_duration,</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;                             <span class="keywordtype">int</span> duration,</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;                             <span class="keywordtype">int</span> flags,</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;                             <span class="keywordtype">bool</span> is_key_frame,</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                             <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                             <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">void</span> Reset();</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">void</span> ExtendBuffer(<span class="keywordtype">int</span> bytes_needed);</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> UpdateUInt64(<span class="keywordtype">int</span> offset, int64_t value);</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">void</span> WriteBlock(uint8_t* buf,</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;                  <span class="keywordtype">int</span> track_num,</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;                  int64_t timecode,</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;                  <span class="keywordtype">int</span> flags,</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;                  <span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                  <span class="keywordtype">int</span> size);</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;  scoped_ptr&lt;uint8_t[]&gt; buffer_;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">int</span> buffer_size_;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">int</span> bytes_used_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  int64_t cluster_timecode_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</a>);</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="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1Cluster_html"><div class="ttname"><a href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/db2/cluster__builder_8h_source.html#l00014">cluster_builder.h:14</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1ClusterBuilder_html"><div class="ttname"><a href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">shaka::media::ClusterBuilder</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/db2/cluster__builder_8h_source.html#l00029">cluster_builder.h:29</a></div></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/macros.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"><a class="line" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">   16</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> {</div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  <a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>(std::unique_ptr&lt;uint8_t[]&gt; data, <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;  ~<a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>();</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> uint8_t* data()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.get(); }</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <span class="keywordtype">int</span> size()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> size_; }</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">private</span>:</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; data_;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keywordtype">int</span> size_;</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;  DISALLOW_IMPLICIT_CONSTRUCTORS(<a class="code" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>);</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"><a class="line" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</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="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</a>();</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  ~<a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</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;  <span class="keywordtype">void</span> SetClusterTimecode(int64_t cluster_timecode);</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">void</span> AddSimpleBlock(<span class="keywordtype">int</span> track_num,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                      int64_t timecode,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                      <span class="keywordtype">int</span> flags,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                      <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                      <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">void</span> AddBlockGroup(<span class="keywordtype">int</span> track_num,</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                     int64_t timecode,</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                     <span class="keywordtype">int</span> duration,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                     <span class="keywordtype">int</span> flags,</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                     <span class="keywordtype">bool</span> is_key_frame,</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;                     <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                     <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordtype">void</span> AddBlockGroupWithoutBlockDuration(<span class="keywordtype">int</span> track_num,</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                                         int64_t timecode,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                         <span class="keywordtype">int</span> flags,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                                         <span class="keywordtype">bool</span> is_key_frame,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                                         <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                                         <span class="keywordtype">int</span> size);</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;  std::unique_ptr&lt;Cluster&gt; Finish();</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  std::unique_ptr&lt;Cluster&gt; FinishWithUnknownSize();</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="keyword">private</span>:</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> AddBlockGroupInternal(<span class="keywordtype">int</span> track_num,</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;                             int64_t timecode,</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;                             <span class="keywordtype">bool</span> include_block_duration,</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;                             <span class="keywordtype">int</span> duration,</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                             <span class="keywordtype">int</span> flags,</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                             <span class="keywordtype">bool</span> is_key_frame,</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                             <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                             <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> Reset();</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">void</span> ExtendBuffer(<span class="keywordtype">int</span> bytes_needed);</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">void</span> UpdateUInt64(<span class="keywordtype">int</span> offset, int64_t value);</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordtype">void</span> WriteBlock(uint8_t* buf,</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;                  <span class="keywordtype">int</span> track_num,</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;                  int64_t timecode,</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                  <span class="keywordtype">int</span> flags,</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                  <span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;                  <span class="keywordtype">int</span> size);</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;uint8_t[]&gt; buffer_;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordtype">int</span> buffer_size_;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordtype">int</span> bytes_used_;</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  int64_t cluster_timecode_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">ClusterBuilder</a>);</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">   86</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1Cluster_html"><div class="ttname"><a href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/db2/cluster__builder_8h_source.html#l00016">cluster_builder.h:16</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1ClusterBuilder_html"><div class="ttname"><a href="../../db/d94/classshaka_1_1media_1_1ClusterBuilder.html">shaka::media::ClusterBuilder</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d4/db2/cluster__builder_8h_source.html#l00031">cluster_builder.h:31</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 08914da645..f2110a65fd 100644
--- a/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html
+++ b/docs/d4/db4/classshaka_1_1MpdNotifierFactory.html
@@ -98,9 +98,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ae52399732d0c05e695787b0fba77d0e9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae52399732d0c05e695787b0fba77d0e9"></a>
-virtual scoped_ptr&lt; <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html">MpdNotifier</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>Create</b> (DashProfile dash_profile, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, const std::vector&lt; std::string &gt; &amp;base_urls, const std::string &amp;output_path)=0</td></tr>
-<tr class="separator:ae52399732d0c05e695787b0fba77d0e9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9ac7281feb43ff2b2938a1cbae4a938d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9ac7281feb43ff2b2938a1cbae4a938d"></a>
+virtual std::unique_ptr<br class="typebreak"/>
+&lt; <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html">MpdNotifier</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>Create</b> (DashProfile dash_profile, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, const std::vector&lt; std::string &gt; &amp;base_urls, const std::string &amp;output_path)=0</td></tr>
+<tr class="separator:a9ac7281feb43ff2b2938a1cbae4a938d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>This is mainly for testing, and is implementation detail. No need to worry about this class if you are just using the API. Inject a factory and mock <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifier.html">MpdNotifier</a> to test the <a class="el" href="../../db/dcd/classshaka_1_1MpdWriter.html">MpdWriter</a> implementation. </p>
@@ -112,7 +113,7 @@ virtual scoped_ptr&lt; <a class="el" href="../../d3/dd0/classshaka_1_1MpdNotifie
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3eeb7fdca7..2ba48731ad 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 58ba013621..3ff59b1bb9 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 cc55d3dec2..d38291fc3d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 2d0f5c7ad1..86639f5b79 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a135603a45..b452df7200 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 62fc3989db..7f2619f853 100644
--- a/docs/d4/dde/webvtt__util_8h_source.html
+++ b/docs/d4/dde/webvtt__util_8h_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 0ca3800269..1c25de4591 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 344987a4ab..fc02863d7e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 719fe6c984..556b1082a5 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 5606780292..e79598f6da 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 66cb802b4c..0c0fe15d1f 100644
--- a/docs/d4/df5/request__signer_8cc_source.html
+++ b/docs/d4/df5/request__signer_8cc_source.html
@@ -109,8 +109,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;RequestSigner::~RequestSigner() {}</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;AesRequestSigner::AesRequestSigner(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                                   scoped_ptr&lt;AesCbcEncryptor&gt; encryptor)</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    : RequestSigner(signer_name), aes_cbc_encryptor_(encryptor.Pass()) {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                                   std::unique_ptr&lt;AesCbcEncryptor&gt; encryptor)</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    : RequestSigner(signer_name), aes_cbc_encryptor_(std::move(encryptor)) {</div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  DCHECK(aes_cbc_encryptor_);</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;AesRequestSigner::~AesRequestSigner() {}</div>
@@ -129,11 +129,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    <span class="keywordflow">return</span> NULL;</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;  scoped_ptr&lt;AesCbcEncryptor&gt; encryptor(</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  std::unique_ptr&lt;AesCbcEncryptor&gt; encryptor(</div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;      <span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(kPkcs5Padding, AesCryptor::kUseConstantIv));</div>
 <div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordflow">if</span> (!encryptor-&gt;InitializeWithIv(aes_key, iv))</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;  <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>(signer_name, encryptor.Pass());</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>(signer_name, std::move(encryptor));</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="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a3010ad8c4c1588358a8d31a97afd6428">   50</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a3010ad8c4c1588358a8d31a97afd6428">AesRequestSigner::GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
@@ -142,43 +142,44 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;RsaRequestSigner::RsaRequestSigner(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                                   scoped_ptr&lt;RsaPrivateKey&gt; rsa_private_key)</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    : <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>(signer_name), rsa_private_key_(rsa_private_key.Pass()) {</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  DCHECK(rsa_private_key_);</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;RsaRequestSigner::~RsaRequestSigner() {}</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"><a class="line" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">   63</a></span>&#160;<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>* <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">RsaRequestSigner::CreateSigner</a>(</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keyword">const</span> std::string&amp; pkcs1_rsa_key) {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  scoped_ptr&lt;RsaPrivateKey&gt; rsa_private_key(</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;      <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">RsaPrivateKey::Create</a>(pkcs1_rsa_key));</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordflow">if</span> (!rsa_private_key)</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>(signer_name, rsa_private_key.Pass());</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="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">   73</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">RsaRequestSigner::GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                                         std::string* signature) {</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keywordflow">return</span> rsa_private_key_-&gt;GenerateSignature(message, signature);</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</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#l00063">request_signer.cc:63</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RequestSigner_html"><div class="ttname"><a href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">shaka::media::RequestSigner</a></div><div class="ttdoc">Abstract class used for signature generation. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00021">request_signer.h:21</a></div></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;RsaRequestSigner::RsaRequestSigner(</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    std::unique_ptr&lt;RsaPrivateKey&gt; rsa_private_key)</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    : <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>(signer_name), rsa_private_key_(std::move(rsa_private_key)) {</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  DCHECK(rsa_private_key_);</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;RsaRequestSigner::~RsaRequestSigner() {}</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"><a class="line" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">   64</a></span>&#160;<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>* <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">RsaRequestSigner::CreateSigner</a>(</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keyword">const</span> std::string&amp; pkcs1_rsa_key) {</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  std::unique_ptr&lt;RsaPrivateKey&gt; rsa_private_key(</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;      <a class="code" href="../../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8">RsaPrivateKey::Create</a>(pkcs1_rsa_key));</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordflow">if</span> (!rsa_private_key)</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>(signer_name, std::move(rsa_private_key));</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="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">   74</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">RsaRequestSigner::GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                                         std::string* signature) {</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordflow">return</span> rsa_private_key_-&gt;GenerateSignature(message, signature);</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="comment">// namespace media</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</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_1RequestSigner_html"><div class="ttname"><a href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">shaka::media::RequestSigner</a></div><div class="ttdoc">Abstract class used for signature generation. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00022">request_signer.h:22</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_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#l00078">aes_encryptor.h:78</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RsaRequestSigner_html"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">shaka::media::RsaRequestSigner</a></div><div class="ttdoc">RsaRequestSigner uses RSA-PSS signing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00067">request_signer.h:67</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_1RsaRequestSigner_html"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">shaka::media::RsaRequestSigner</a></div><div class="ttdoc">RsaRequestSigner uses RSA-PSS signing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00068">request_signer.h:68</a></div></div>
 <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#l00073">request_signer.cc:73</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#l00043">request_signer.h:43</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 492e1802f4..8a33634af8 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 5ef095b22a..62cee7ff32 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 9098e8eb0c..36afa5236d 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 06a4a20201..fab18a96a2 100644
--- a/docs/d4/dff/webm__media__parser_8cc_source.html
+++ b/docs/d4/dff/webm__media__parser_8cc_source.html
@@ -359,12 +359,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_aca6ecdac6ebc131d3626b765f64cb2de"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">shaka::media::KeySource::FetchKeys</a></div><div class="ttdeci">virtual Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_ab1659ef71098c37e9fb4e55ab1664e84"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">shaka::media::ByteQueue::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset the queue to the empty state. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00024">byte_queue.cc:24</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_a838fe5642e533477a5e229981e5f06e7"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">shaka::media::ByteQueue::Peek</a></div><div class="ttdeci">void Peek(const uint8_t **data, int *size) const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00063">byte_queue.cc:63</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0f7ff0cb43..51ed8afa1a 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 40eee07888..de85f5f00b 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 6d5e73ad15..984ab3e435 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 8eeb308780..447ff707e7 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 3923d16502..abd64f4bc4 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 40231e49f1..2e20b497d7 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 e591c0f992..7a10dedab7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 485080b562..1aae6b072c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 1b049e3331..d1ed32cc53 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
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0"><td class="entry"><b>cts</b>() const  (defined in <a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a>)</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>dts</b>() const  (defined in <a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a>)</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>duration</b>() const  (defined in <a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a>)</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">GetDecryptConfig</a>()</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">GetDecryptConfig</a>()</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae7a223474c46dd542e7390030893cca4">GetMaxClearOffset</a>()</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae9f02c32b4e2be8fc41a20f3f00f3494">Init</a>()</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a4d39eaf8568da29b597411c56f50d86f">Init</a>(const MovieFragment &amp;moof)</td><td class="entry"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></td><td class="entry"></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 961c86b453..c3f9d7d5f3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 a077d4d688..e9bfe828eb 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 ad1690e484..f27f8f2629 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 187773be59..17eabc69f2 100644
--- a/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html
+++ b/docs/d5/d40/webm_2single__segment__segmenter_8h_source.html
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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 &quot;packager/media/formats/webm/segmenter.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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/status.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/mkv_writer.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;</div>
@@ -122,30 +122,32 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keywordtype">void</span> set_init_end(uint64_t end) { init_end_ = end; }</div>
 <div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">void</span> set_index_start(uint64_t start) { index_start_ = start; }</div>
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">void</span> set_index_end(uint64_t end) { index_end_ = end; }</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">void</span> set_writer(scoped_ptr&lt;MkvWriter&gt; writer) { writer_ = writer.Pass(); }</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="comment">// Segmenter implementation overrides.</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSubsegment(uint64_t start_timescale) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSegment(uint64_t start_timescale) <span class="keyword">override</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;  scoped_ptr&lt;MkvWriter&gt; writer_;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  uint64_t init_end_;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  uint64_t index_start_;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  uint64_t index_end_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a>);</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">// namespace webm</span></div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">void</span> set_writer(std::unique_ptr&lt;MkvWriter&gt; writer) {</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    writer_ = std::move(writer);</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">// Segmenter implementation overrides.</span></div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSubsegment(uint64_t start_timescale) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSegment(uint64_t start_timescale) <span class="keyword">override</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;  std::unique_ptr&lt;MkvWriter&gt; writer_;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  uint64_t init_end_;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  uint64_t index_start_;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  uint64_t index_end_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a>);</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="comment">// namespace webm</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter_html_ae1395bcb6fb255b2695766c1e85b1aa3"><div class="ttname"><a href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#ae1395bcb6fb255b2695766c1e85b1aa3">shaka::media::webm::SingleSegmentSegmenter::GetInitRangeStartAndEnd</a></div><div class="ttdeci">bool GetInitRangeStartAndEnd(uint64_t *start, uint64_t *end) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/df0/webm_2single__segment__segmenter_8cc_source.html#l00070">single_segment_segmenter.cc:70</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter_html"><div class="ttname"><a href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d40/webm_2single__segment__segmenter_8h_source.html#l00026">single_segment_segmenter.h:26</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter_html_a1708739c73c4565d5dfda6bedffd89a8"><div class="ttname"><a href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#a1708739c73c4565d5dfda6bedffd89a8">shaka::media::webm::SingleSegmentSegmenter::GetIndexRangeStartAndEnd</a></div><div class="ttdeci">bool GetIndexRangeStartAndEnd(uint64_t *start, uint64_t *end) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/df0/webm_2single__segment__segmenter_8cc_source.html#l00079">single_segment_segmenter.cc:79</a></div></div>
@@ -156,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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 02fcbb060e..7283bfd438 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 44e04c49ba..dd2a6fe211 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 90a8210bcf..3106cae3cd 100644
--- a/docs/d5/d52/ts__section__pes_8h_source.html
+++ b/docs/d5/d52/ts__section__pes_8h_source.html
@@ -95,73 +95,72 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/byte_queue.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/ts_section.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;<span class="keyword">namespace </span>mp2t {</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">class </span>EsParser;</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"><a class="line" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a> : <span class="keyword">public</span> <a class="code" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">TsSection</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="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a>(scoped_ptr&lt;EsParser&gt; es_parser);</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  ~<a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</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="comment">// TsSection implementation.</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keywordtype">bool</span> Parse(<span class="keywordtype">bool</span> payload_unit_start_indicator,</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;             <span class="keyword">const</span> uint8_t* buf,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;             <span class="keywordtype">int</span> size) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keywordtype">void</span> Flush() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordtype">void</span> Reset() <span class="keyword">override</span>;</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">private</span>:</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="comment">// Emit a reassembled PES packet.</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="comment">// Return true if successful.</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="comment">// |emit_for_unknown_size| is used to force emission for PES packets</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="comment">// whose size is unknown.</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">bool</span> Emit(<span class="keywordtype">bool</span> emit_for_unknown_size);</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">// Parse a PES packet, return true if successful.</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> ParseInternal(<span class="keyword">const</span> uint8_t* raw_pes, <span class="keywordtype">int</span> raw_pes_size);</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="keywordtype">void</span> ResetPesState();</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">// Bytes of the current PES.</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> pes_byte_queue_;</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">// ES parser.</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  scoped_ptr&lt;EsParser&gt; es_parser_;</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">// Do not start parsing before getting a unit start indicator.</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordtype">bool</span> wait_for_pusi_;</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">// Used to unroll PTS and DTS.</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">bool</span> previous_pts_valid_;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  int64_t previous_pts_;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordtype">bool</span> previous_dts_valid_;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  int64_t previous_dts_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a>);</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="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;<span class="preprocessor"></span></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#l00020">byte_queue.h:20</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSectionPes_html"><div class="ttname"><a href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d52/ts__section__pes_8h_source.html#l00021">ts_section_pes.h:21</a></div></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/byte_queue.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/ts_section.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;<span class="keyword">namespace </span>mp2t {</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">class </span>EsParser;</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"><a class="line" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">   20</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a> : <span class="keyword">public</span> <a class="code" href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">TsSection</a> {</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a>(std::unique_ptr&lt;EsParser&gt; es_parser);</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  ~<a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a>() <span class="keyword">override</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="comment">// TsSection implementation.</span></div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keywordtype">bool</span> Parse(<span class="keywordtype">bool</span> payload_unit_start_indicator,</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;             <span class="keyword">const</span> uint8_t* buf,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;             <span class="keywordtype">int</span> size) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keywordtype">void</span> Flush() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keywordtype">void</span> Reset() <span class="keyword">override</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">private</span>:</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="comment">// Emit a reassembled PES packet.</span></div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="comment">// Return true if successful.</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="comment">// |emit_for_unknown_size| is used to force emission for PES packets</span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="comment">// whose size is unknown.</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">bool</span> Emit(<span class="keywordtype">bool</span> emit_for_unknown_size);</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">// Parse a PES packet, return true if successful.</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> ParseInternal(<span class="keyword">const</span> uint8_t* raw_pes, <span class="keywordtype">int</span> raw_pes_size);</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="keywordtype">void</span> ResetPesState();</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="comment">// Bytes of the current PES.</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> pes_byte_queue_;</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">// ES parser.</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  std::unique_ptr&lt;EsParser&gt; es_parser_;</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">// Do not start parsing before getting a unit start indicator.</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">bool</span> wait_for_pusi_;</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="comment">// Used to unroll PTS and DTS.</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">bool</span> previous_pts_valid_;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  int64_t previous_pts_;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">bool</span> previous_dts_valid_;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  int64_t previous_dts_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">TsSectionPes</a>);</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">// namespace mp2t</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;<span class="preprocessor"></span></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_1mp2t_1_1TsSectionPes_html"><div class="ttname"><a href="../../d1/d30/classshaka_1_1media_1_1mp2t_1_1TsSectionPes.html">shaka::media::mp2t::TsSectionPes</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d52/ts__section__pes_8h_source.html#l00020">ts_section_pes.h:20</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSection_html"><div class="ttname"><a href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d1a/ts__section_8h_source.html#l00012">ts_section.h:12</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0285eb8612..0cdf61318a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 6668342097..b286388b62 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 88001b614d..81861d9b5c 100644
--- a/docs/d5/d59/classshaka_1_1MockRepresentation-members.html
+++ b/docs/d5/d59/classshaka_1_1MockRepresentation-members.html
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MOCK_METHOD2</b>(UpdateContentProtectionPssh, void(const std::string &amp;drm_uuid, const std::string &amp;pssh)) (defined in <a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a>)</td><td class="entry"><a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>MOCK_METHOD3</b>(AddNewSegment, void(uint64_t start_time, uint64_t duration, uint64_t size)) (defined in <a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a>)</td><td class="entry"><a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MockRepresentation</b>(uint32_t representation_id) (defined in <a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a>)</td><td class="entry"><a class="el" href="../../d0/d33/classshaka_1_1MockRepresentation.html">shaka::MockRepresentation</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">Representation</a>(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, scoped_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a>(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">SetSampleDuration</a>(uint32_t sample_duration)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>SuppressFlag</b> enum name (defined in <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a>)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">SuppressOnce</a>(SuppressFlag flag)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a4f8961ab0..642b370ab7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0cd6ac6f0b..ae8fad088f 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
@@ -113,9 +113,9 @@ Public Member Functions</h2></td></tr>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>Reset</b> () override</td></tr>
 <tr class="separator:ab666c13c507d5ccd80cd2afc06b08f8c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x')"><img src="../../closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td></tr>
-<tr class="memitem:a1ad0d1d76943970a6e16f3d95b732798 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1ad0d1d76943970a6e16f3d95b732798"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, scoped_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
-<tr class="separator:a1ad0d1d76943970a6e16f3d95b732798 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2f10c5ee6ede293c7e53056d806533f5 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2f10c5ee6ede293c7e53056d806533f5"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, std::unique_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
+<tr class="separator:a2f10c5ee6ede293c7e53056d806533f5 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac0fdc73889cbc5d3a83cc7cff29259b8 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac0fdc73889cbc5d3a83cc7cff29259b8"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>Parse</b> (const uint8_t *buf, int size, int64_t pts, int64_t dts) override</td></tr>
 <tr class="separator:ac0fdc73889cbc5d3a83cc7cff29259b8 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -161,7 +161,7 @@ const <br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 dbb684a214..e2e263847e 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b295c308f0..6cb4e0fc78 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 0d7e8a4637..10c0bc2dd4 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 41f1d25225..9e3b079a61 100644
--- a/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html
+++ b/docs/d5/d72/avc__decoder__configuration__record_8cc_source.html
@@ -203,7 +203,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 69baf5aba3..48e36928e7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b74e2ee8f2..66543e70e6 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 1d4d48ae66..f48a530af8 100644
--- a/docs/d5/d89/widevine__key__source_8cc_source.html
+++ b/docs/d5/d89/widevine__key__source_8cc_source.html
@@ -366,361 +366,365 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  <span class="keywordflow">return</span> GetKeyInternal(crypto_period_index, track_type, key);</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"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">  280</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">WidevineKeySource::set_signer</a>(scoped_ptr&lt;RequestSigner&gt; signer) {</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;  signer_ = signer.Pass();</div>
+<div class="line"><a name="l00280"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">  280</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="l00281"></a><span class="lineno">  281</span>&#160;  signer_ = std::move(signer);</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"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">  284</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">WidevineKeySource::set_key_fetcher</a>(scoped_ptr&lt;KeyFetcher&gt; key_fetcher) {</div>
-<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;  key_fetcher_ = key_fetcher.Pass();</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;<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="l00289"></a><span class="lineno">  289</span>&#160;                                         TrackType track_type,</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;                                         <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  DCHECK(key_pool_);</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  DCHECK(key);</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  DCHECK_LE(track_type, NUM_VALID_TRACK_TYPES);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  DCHECK_NE(track_type, TRACK_TYPE_UNKNOWN);</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;  scoped_refptr&lt;RefCountedEncryptionKeyMap&gt; ref_counted_encryption_key_map;</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status =</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;      key_pool_-&gt;Peek(crypto_period_index, &amp;ref_counted_encryption_key_map,</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;                      kGetKeyTimeoutInSeconds * 1000);</div>
-<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;    <span class="keywordflow">if</span> (status.error_code() == error::STOPPED) {</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;      CHECK(!common_encryption_request_status_.ok());</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;      <span class="keywordflow">return</span> common_encryption_request_status_;</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">return</span> 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;</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  EncryptionKeyMap&amp; encryption_key_map = ref_counted_encryption_key_map-&gt;map();</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map.find(track_type) == encryption_key_map.end()) {</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR,</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</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="l00312"></a><span class="lineno">  312</span>&#160;  }</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;  *key = *encryption_key_map[track_type];</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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;</div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;<span class="keywordtype">void</span> WidevineKeySource::FetchKeysTask() {</div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;  <span class="comment">// Wait until key production is signaled.</span></div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  start_key_production_.Wait();</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  <span class="keywordflow">if</span> (!key_pool_ || key_pool_-&gt;Stopped())</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;    <span class="keywordflow">return</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;  Status status = FetchKeysInternal(kEnableKeyRotation,</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;                                    first_crypto_period_index_,</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;                                    <span class="keyword">false</span>);</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;  <span class="keywordflow">while</span> (status.ok()) {</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160;    first_crypto_period_index_ += crypto_period_count_;</div>
-<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;    status = FetchKeysInternal(kEnableKeyRotation,</div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;                               first_crypto_period_index_,</div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;                               <span class="keyword">false</span>);</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;  common_encryption_request_status_ = status;</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;  key_pool_-&gt;Stop();</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;Status WidevineKeySource::FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;                                            uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;                                            <span class="keywordtype">bool</span> widevine_classic) {</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;  std::string request;</div>
-<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  FillRequest(enable_key_rotation,</div>
-<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;              first_crypto_period_index,</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;              &amp;request);</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;  std::string message;</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;  Status status = GenerateKeyMessage(request, &amp;message);</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;    <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;  VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Message: &quot;</span> &lt;&lt; message;</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;  std::string raw_response;</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;  int64_t sleep_duration = kFirstRetryDelayMilliseconds;</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="comment">// Perform client side retries if seeing server transient error to workaround</span></div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;  <span class="comment">// server limitation.</span></div>
-<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; kNumTransientErrorRetries; ++i) {</div>
-<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    status = key_fetcher_-&gt;FetchKeys(server_url_, message, &amp;raw_response);</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    <span class="keywordflow">if</span> (status.ok()) {</div>
-<div class="line"><a name="l00358"></a><span class="lineno">  358</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="l00359"></a><span class="lineno">  359</span>&#160;</div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;      std::string response;</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      <span class="keywordflow">if</span> (!DecodeResponse(raw_response, &amp;response)) {</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;        <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</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="l00364"></a><span class="lineno">  364</span>&#160;      }</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="keywordtype">bool</span> transient_error = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;      <span class="keywordflow">if</span> (ExtractEncryptionKey(enable_key_rotation,</div>
-<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;                               widevine_classic,</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;                               response,</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;                               &amp;transient_error))</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;      <span class="keywordflow">if</span> (!transient_error) {</div>
-<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;        <span class="keywordflow">return</span> Status(</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;            error::SERVER_ERROR,</div>
-<div class="line"><a name="l00376"></a><span class="lineno">  376</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="l00377"></a><span class="lineno">  377</span>&#160;      }</div>
-<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (status.error_code() != error::TIME_OUT) {</div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;      <span class="keywordflow">return</span> status;</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;</div>
-<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;    <span class="comment">// Exponential backoff.</span></div>
-<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    <span class="keywordflow">if</span> (i != kNumTransientErrorRetries - 1) {</div>
-<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;      base::PlatformThread::Sleep(</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;          base::TimeDelta::FromMilliseconds(sleep_duration));</div>
-<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;      sleep_duration *= 2;</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="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
-<div class="line"><a name="l00390"></a><span class="lineno">  390</span>&#160;                <span class="stringliteral">&quot;Failed to recover from server internal error.&quot;</span>);</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">void</span> WidevineKeySource::FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00394"></a><span class="lineno">  394</span>&#160;                                    uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;                                    std::string* request) {</div>
-<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;  DCHECK(request);</div>
-<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  DCHECK(!request_dict_.empty());</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">// Build tracks.</span></div>
-<div class="line"><a name="l00400"></a><span class="lineno">  400</span>&#160;  base::ListValue* tracks = <span class="keyword">new</span> base::ListValue();</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;  base::DictionaryValue* track_sd = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00403"></a><span class="lineno">  403</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="l00404"></a><span class="lineno">  404</span>&#160;  tracks-&gt;Append(track_sd);</div>
-<div class="line"><a name="l00405"></a><span class="lineno">  405</span>&#160;  base::DictionaryValue* track_hd = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00406"></a><span class="lineno">  406</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="l00407"></a><span class="lineno">  407</span>&#160;  tracks-&gt;Append(track_hd);</div>
-<div class="line"><a name="l00408"></a><span class="lineno">  408</span>&#160;  base::DictionaryValue* track_audio = <span class="keyword">new</span> base::DictionaryValue();</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</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="l00410"></a><span class="lineno">  410</span>&#160;  tracks-&gt;Append(track_audio);</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;  request_dict_.Set(<span class="stringliteral">&quot;tracks&quot;</span>, tracks);</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">// Build DRM types.</span></div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;  base::ListValue* drm_types = <span class="keyword">new</span> base::ListValue();</div>
-<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  drm_types-&gt;AppendString(<span class="stringliteral">&quot;WIDEVINE&quot;</span>);</div>
-<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;drm_types&quot;</span>, drm_types);</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="comment">// Build key rotation fields.</span></div>
-<div class="line"><a name="l00420"></a><span class="lineno">  420</span>&#160;  <span class="keywordflow">if</span> (enable_key_rotation) {</div>
-<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;    <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
-<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;    <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
-<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;    request_dict_.SetDouble(<span class="stringliteral">&quot;first_crypto_period_index&quot;</span>,</div>
-<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;                            first_crypto_period_index);</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;    request_dict_.SetInteger(<span class="stringliteral">&quot;crypto_period_count&quot;</span>, crypto_period_count_);</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;  base::JSONWriter::WriteWithOptions(</div>
-<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;      request_dict_,</div>
-<div class="line"><a name="l00430"></a><span class="lineno">  430</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="l00431"></a><span class="lineno">  431</span>&#160;      <span class="comment">// without using exponential notation or appending a &#39;.0&#39;.</span></div>
-<div class="line"><a name="l00432"></a><span class="lineno">  432</span>&#160;      base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, request);</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;Status WidevineKeySource::GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request,</div>
-<div class="line"><a name="l00436"></a><span class="lineno">  436</span>&#160;                                             std::string* message) {</div>
-<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;  DCHECK(message);</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;  std::string request_base64_string;</div>
-<div class="line"><a name="l00440"></a><span class="lineno">  440</span>&#160;  base::Base64Encode(request, &amp;request_base64_string);</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;  base::DictionaryValue request_dict;</div>
-<div class="line"><a name="l00443"></a><span class="lineno">  443</span>&#160;  request_dict.SetString(<span class="stringliteral">&quot;request&quot;</span>, request_base64_string);</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="comment">// Sign the request.</span></div>
-<div class="line"><a name="l00446"></a><span class="lineno">  446</span>&#160;  <span class="keywordflow">if</span> (signer_) {</div>
-<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;    std::string signature;</div>
-<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;    <span class="keywordflow">if</span> (!signer_-&gt;GenerateSignature(request, &amp;signature))</div>
-<div class="line"><a name="l00449"></a><span class="lineno">  449</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="l00450"></a><span class="lineno">  450</span>&#160;</div>
-<div class="line"><a name="l00451"></a><span class="lineno">  451</span>&#160;    std::string signature_base64_string;</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;    base::Base64Encode(signature, &amp;signature_base64_string);</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;    request_dict.SetString(<span class="stringliteral">&quot;signature&quot;</span>, signature_base64_string);</div>
-<div class="line"><a name="l00455"></a><span class="lineno">  455</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signer&quot;</span>, signer_-&gt;signer_name());</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;  base::JSONWriter::Write(request_dict, message);</div>
-<div class="line"><a name="l00459"></a><span class="lineno">  459</span>&#160;  <span class="keywordflow">return</span> Status::OK;</div>
-<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;}</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="keywordtype">bool</span> WidevineKeySource::DecodeResponse(</div>
-<div class="line"><a name="l00463"></a><span class="lineno">  463</span>&#160;    <span class="keyword">const</span> std::string&amp; raw_response,</div>
-<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    std::string* response) {</div>
-<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;  DCHECK(response);</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;  <span class="comment">// Extract base64 formatted response from JSON formatted raw response.</span></div>
-<div class="line"><a name="l00468"></a><span class="lineno">  468</span>&#160;  scoped_ptr&lt;base::Value&gt; root(base::JSONReader::Read(raw_response));</div>
-<div class="line"><a name="l00469"></a><span class="lineno">  469</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
-<div class="line"><a name="l00470"></a><span class="lineno">  470</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="l00471"></a><span class="lineno">  471</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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="keyword">const</span> base::DictionaryValue* response_dict = NULL;</div>
-<div class="line"><a name="l00474"></a><span class="lineno">  474</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;response_dict));</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;  std::string response_base64_string;</div>
-<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  RCHECK(response_dict-&gt;GetString(<span class="stringliteral">&quot;response&quot;</span>, &amp;response_base64_string));</div>
-<div class="line"><a name="l00478"></a><span class="lineno">  478</span>&#160;  RCHECK(base::Base64Decode(response_base64_string, response));</div>
-<div class="line"><a name="l00479"></a><span class="lineno">  479</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
-<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::ExtractEncryptionKey(</div>
-<div class="line"><a name="l00483"></a><span class="lineno">  483</span>&#160;    <span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00484"></a><span class="lineno">  484</span>&#160;    <span class="keywordtype">bool</span> widevine_classic,</div>
-<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;    <span class="keyword">const</span> std::string&amp; response,</div>
-<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;    <span class="keywordtype">bool</span>* transient_error) {</div>
-<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;  DCHECK(transient_error);</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;  *transient_error = <span class="keyword">false</span>;</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;  scoped_ptr&lt;base::Value&gt; root(base::JSONReader::Read(response));</div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</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="l00493"></a><span class="lineno">  493</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;</div>
-<div class="line"><a name="l00496"></a><span class="lineno">  496</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* license_dict = NULL;</div>
-<div class="line"><a name="l00497"></a><span class="lineno">  497</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;license_dict));</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::string license_status;</div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  RCHECK(license_dict-&gt;GetString(<span class="stringliteral">&quot;status&quot;</span>, &amp;license_status));</div>
-<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  <span class="keywordflow">if</span> (license_status != kLicenseStatusOK) {</div>
-<div class="line"><a name="l00502"></a><span class="lineno">  502</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="l00503"></a><span class="lineno">  503</span>&#160;    *transient_error = (license_status == kLicenseStatusTransientError);</div>
-<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;  <span class="keyword">const</span> base::ListValue* tracks;</div>
-<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;  RCHECK(license_dict-&gt;GetList(<span class="stringliteral">&quot;tracks&quot;</span>, &amp;tracks));</div>
-<div class="line"><a name="l00509"></a><span class="lineno">  509</span>&#160;  <span class="comment">// Should have at least one track per crypto_period.</span></div>
-<div class="line"><a name="l00510"></a><span class="lineno">  510</span>&#160;  RCHECK(enable_key_rotation ? tracks-&gt;GetSize() &gt;= 1 * crypto_period_count_</div>
-<div class="line"><a name="l00511"></a><span class="lineno">  511</span>&#160;                             : tracks-&gt;GetSize() &gt;= 1);</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;  <span class="keywordtype">int</span> current_crypto_period_index = first_crypto_period_index_;</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;  EncryptionKeyMap encryption_key_map;</div>
-<div class="line"><a name="l00516"></a><span class="lineno">  516</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="l00517"></a><span class="lineno">  517</span>&#160;    <span class="keyword">const</span> base::DictionaryValue* track_dict;</div>
-<div class="line"><a name="l00518"></a><span class="lineno">  518</span>&#160;    RCHECK(tracks-&gt;GetDictionary(i, &amp;track_dict));</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">if</span> (enable_key_rotation) {</div>
-<div class="line"><a name="l00521"></a><span class="lineno">  521</span>&#160;      <span class="keywordtype">int</span> crypto_period_index;</div>
-<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;      RCHECK(</div>
-<div class="line"><a name="l00523"></a><span class="lineno">  523</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="l00524"></a><span class="lineno">  524</span>&#160;      <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index) {</div>
-<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;        <span class="keywordflow">if</span> (crypto_period_index != current_crypto_period_index + 1) {</div>
-<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting crypto period index &quot;</span></div>
-<div class="line"><a name="l00527"></a><span class="lineno">  527</span>&#160;                     &lt;&lt; current_crypto_period_index &lt;&lt; <span class="stringliteral">&quot; or &quot;</span></div>
-<div class="line"><a name="l00528"></a><span class="lineno">  528</span>&#160;                     &lt;&lt; current_crypto_period_index + 1 &lt;&lt; <span class="stringliteral">&quot;; Seen &quot;</span></div>
-<div class="line"><a name="l00529"></a><span class="lineno">  529</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="l00530"></a><span class="lineno">  530</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</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;        <span class="keywordflow">if</span> (!PushToKeyPool(&amp;encryption_key_map))</div>
-<div class="line"><a name="l00533"></a><span class="lineno">  533</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00534"></a><span class="lineno">  534</span>&#160;        ++current_crypto_period_index;</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;</div>
-<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;    std::string track_type_str;</div>
-<div class="line"><a name="l00539"></a><span class="lineno">  539</span>&#160;    RCHECK(track_dict-&gt;GetString(<span class="stringliteral">&quot;type&quot;</span>, &amp;track_type_str));</div>
-<div class="line"><a name="l00540"></a><span class="lineno">  540</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="l00541"></a><span class="lineno">  541</span>&#160;    DCHECK_NE(TRACK_TYPE_UNKNOWN, track_type);</div>
-<div class="line"><a name="l00542"></a><span class="lineno">  542</span>&#160;    RCHECK(encryption_key_map.find(track_type) == encryption_key_map.end());</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;    scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> EncryptionKey());</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> (!GetKeyFromTrack(*track_dict, &amp;encryption_key-&gt;key))</div>
-<div class="line"><a name="l00547"></a><span class="lineno">  547</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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">// Get key ID and PSSH data for CENC content only.</span></div>
-<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;    <span class="keywordflow">if</span> (!widevine_classic) {</div>
-<div class="line"><a name="l00551"></a><span class="lineno">  551</span>&#160;      <span class="keywordflow">if</span> (!GetKeyIdFromTrack(*track_dict, &amp;encryption_key-&gt;key_id))</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;      ProtectionSystemSpecificInfo info;</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;      info.add_key_id(encryption_key-&gt;key_id);</div>
-<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;      info.set_system_id(kWidevineSystemId, arraysize(kWidevineSystemId));</div>
-<div class="line"><a name="l00557"></a><span class="lineno">  557</span>&#160;      info.set_pssh_box_version(0);</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;      std::vector&lt;uint8_t&gt; pssh_data;</div>
-<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;      <span class="keywordflow">if</span> (!GetPsshDataFromTrack(*track_dict, &amp;pssh_data))</div>
-<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00562"></a><span class="lineno">  562</span>&#160;      info.set_pssh_data(pssh_data);</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;      encryption_key-&gt;key_system_info.push_back(info);</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;    encryption_key_map[track_type] = encryption_key.release();</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;</div>
-<div class="line"><a name="l00569"></a><span class="lineno">  569</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="l00570"></a><span class="lineno">  570</span>&#160;  <span class="comment">// key IDs of all the keys.</span></div>
-<div class="line"><a name="l00571"></a><span class="lineno">  571</span>&#160;  <span class="keywordflow">if</span> (add_common_pssh_ &amp;&amp; !widevine_classic) {</div>
-<div class="line"><a name="l00572"></a><span class="lineno">  572</span>&#160;    std::set&lt;std::vector&lt;uint8_t&gt;&gt; key_ids;</div>
-<div class="line"><a name="l00573"></a><span class="lineno">  573</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="l00574"></a><span class="lineno">  574</span>&#160;      key_ids.insert(pair.second-&gt;key_id);</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;</div>
-<div class="line"><a name="l00577"></a><span class="lineno">  577</span>&#160;    <span class="comment">// Create a common system PSSH box.</span></div>
-<div class="line"><a name="l00578"></a><span class="lineno">  578</span>&#160;    ProtectionSystemSpecificInfo info;</div>
-<div class="line"><a name="l00579"></a><span class="lineno">  579</span>&#160;    info.set_system_id(kCommonSystemId, arraysize(kCommonSystemId));</div>
-<div class="line"><a name="l00580"></a><span class="lineno">  580</span>&#160;    info.set_pssh_box_version(1);</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</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="l00582"></a><span class="lineno">  582</span>&#160;      info.add_key_id(key_id);</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;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
-<div class="line"><a name="l00586"></a><span class="lineno">  586</span>&#160;      pair.second-&gt;key_system_info.push_back(info);</div>
+<div class="line"><a name="l00284"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">  284</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="l00285"></a><span class="lineno">  285</span>&#160;    std::unique_ptr&lt;KeyFetcher&gt; key_fetcher) {</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;  key_fetcher_ = std::move(key_fetcher);</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;<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="l00290"></a><span class="lineno">  290</span>&#160;                                         TrackType track_type,</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;                                         <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) {</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  DCHECK(key_pool_);</div>
+<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;  DCHECK(key);</div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  DCHECK_LE(track_type, NUM_VALID_TRACK_TYPES);</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  DCHECK_NE(track_type, TRACK_TYPE_UNKNOWN);</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;  scoped_refptr&lt;RefCountedEncryptionKeyMap&gt; ref_counted_encryption_key_map;</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 =</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;      key_pool_-&gt;Peek(crypto_period_index, &amp;ref_counted_encryption_key_map,</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;                      kGetKeyTimeoutInSeconds * 1000);</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">if</span> (status.error_code() == error::STOPPED) {</div>
+<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;      CHECK(!common_encryption_request_status_.ok());</div>
+<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;      <span class="keywordflow">return</span> common_encryption_request_status_;</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;    <span class="keywordflow">return</span> status;</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;  EncryptionKeyMap&amp; encryption_key_map = ref_counted_encryption_key_map-&gt;map();</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  <span class="keywordflow">if</span> (encryption_key_map.find(track_type) == encryption_key_map.end()) {</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR,</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</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="l00313"></a><span class="lineno">  313</span>&#160;  }</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;  *key = *encryption_key_map[track_type];</div>
+<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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;<span class="keywordtype">void</span> WidevineKeySource::FetchKeysTask() {</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;  <span class="comment">// Wait until key production is signaled.</span></div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;  start_key_production_.Wait();</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;  <span class="keywordflow">if</span> (!key_pool_ || key_pool_-&gt;Stopped())</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;  Status 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;  <span class="keywordflow">while</span> (status.ok()) {</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;    first_crypto_period_index_ += crypto_period_count_;</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;    status = FetchKeysInternal(kEnableKeyRotation,</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;                               first_crypto_period_index_,</div>
+<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;                               <span class="keyword">false</span>);</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;  common_encryption_request_status_ = status;</div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;  key_pool_-&gt;Stop();</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;Status WidevineKeySource::FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;                                            uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;                                            <span class="keywordtype">bool</span> widevine_classic) {</div>
+<div class="line"><a name="l00340"></a><span class="lineno">  340</span>&#160;  std::string request;</div>
+<div class="line"><a name="l00341"></a><span class="lineno">  341</span>&#160;  FillRequest(enable_key_rotation,</div>
+<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;              first_crypto_period_index,</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;              &amp;request);</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;  std::string message;</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;  Status status = GenerateKeyMessage(request, &amp;message);</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;    <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;  VLOG(1) &lt;&lt; <span class="stringliteral">&quot;Message: &quot;</span> &lt;&lt; message;</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;  std::string raw_response;</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;  int64_t sleep_duration = kFirstRetryDelayMilliseconds;</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">// Perform client side retries if seeing server transient error to workaround</span></div>
+<div class="line"><a name="l00355"></a><span class="lineno">  355</span>&#160;  <span class="comment">// server limitation.</span></div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = 0; i &lt; kNumTransientErrorRetries; ++i) {</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    status = key_fetcher_-&gt;FetchKeys(server_url_, message, &amp;raw_response);</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;      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="l00360"></a><span class="lineno">  360</span>&#160;</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;      std::string response;</div>
+<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;      <span class="keywordflow">if</span> (!DecodeResponse(raw_response, &amp;response)) {</div>
+<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;        <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</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="l00365"></a><span class="lineno">  365</span>&#160;      }</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="keywordtype">bool</span> transient_error = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;      <span class="keywordflow">if</span> (ExtractEncryptionKey(enable_key_rotation,</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;                               widevine_classic,</div>
+<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;                               response,</div>
+<div class="line"><a name="l00371"></a><span class="lineno">  371</span>&#160;                               &amp;transient_error))</div>
+<div class="line"><a name="l00372"></a><span class="lineno">  372</span>&#160;        <span class="keywordflow">return</span> Status::OK;</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> (!transient_error) {</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;            error::SERVER_ERROR,</div>
+<div class="line"><a name="l00377"></a><span class="lineno">  377</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="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">else</span> <span class="keywordflow">if</span> (status.error_code() != error::TIME_OUT) {</div>
+<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;      <span class="keywordflow">return</span> status;</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;</div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;    <span class="comment">// Exponential backoff.</span></div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;    <span class="keywordflow">if</span> (i != kNumTransientErrorRetries - 1) {</div>
+<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160;      base::PlatformThread::Sleep(</div>
+<div class="line"><a name="l00386"></a><span class="lineno">  386</span>&#160;          base::TimeDelta::FromMilliseconds(sleep_duration));</div>
+<div class="line"><a name="l00387"></a><span class="lineno">  387</span>&#160;      sleep_duration *= 2;</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;  <span class="keywordflow">return</span> Status(error::SERVER_ERROR,</div>
+<div class="line"><a name="l00391"></a><span class="lineno">  391</span>&#160;                <span class="stringliteral">&quot;Failed to recover from server internal error.&quot;</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;<span class="keywordtype">void</span> WidevineKeySource::FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00395"></a><span class="lineno">  395</span>&#160;                                    uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00396"></a><span class="lineno">  396</span>&#160;                                    std::string* request) {</div>
+<div class="line"><a name="l00397"></a><span class="lineno">  397</span>&#160;  DCHECK(request);</div>
+<div class="line"><a name="l00398"></a><span class="lineno">  398</span>&#160;  DCHECK(!request_dict_.empty());</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;  <span class="comment">// Build tracks.</span></div>
+<div class="line"><a name="l00401"></a><span class="lineno">  401</span>&#160;  base::ListValue* tracks = <span class="keyword">new</span> base::ListValue();</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;  base::DictionaryValue* track_sd = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00404"></a><span class="lineno">  404</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="l00405"></a><span class="lineno">  405</span>&#160;  tracks-&gt;Append(track_sd);</div>
+<div class="line"><a name="l00406"></a><span class="lineno">  406</span>&#160;  base::DictionaryValue* track_hd = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00407"></a><span class="lineno">  407</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="l00408"></a><span class="lineno">  408</span>&#160;  tracks-&gt;Append(track_hd);</div>
+<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160;  base::DictionaryValue* track_audio = <span class="keyword">new</span> base::DictionaryValue();</div>
+<div class="line"><a name="l00410"></a><span class="lineno">  410</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="l00411"></a><span class="lineno">  411</span>&#160;  tracks-&gt;Append(track_audio);</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;  request_dict_.Set(<span class="stringliteral">&quot;tracks&quot;</span>, tracks);</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 DRM types.</span></div>
+<div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;  base::ListValue* drm_types = <span class="keyword">new</span> base::ListValue();</div>
+<div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;  drm_types-&gt;AppendString(<span class="stringliteral">&quot;WIDEVINE&quot;</span>);</div>
+<div class="line"><a name="l00418"></a><span class="lineno">  418</span>&#160;  request_dict_.Set(<span class="stringliteral">&quot;drm_types&quot;</span>, drm_types);</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="comment">// Build key rotation fields.</span></div>
+<div class="line"><a name="l00421"></a><span class="lineno">  421</span>&#160;  <span class="keywordflow">if</span> (enable_key_rotation) {</div>
+<div class="line"><a name="l00422"></a><span class="lineno">  422</span>&#160;    <span class="comment">// Javascript/JSON does not support int64_t or unsigned numbers. Use double</span></div>
+<div class="line"><a name="l00423"></a><span class="lineno">  423</span>&#160;    <span class="comment">// instead as 32-bit integer can be lossless represented using double.</span></div>
+<div class="line"><a name="l00424"></a><span class="lineno">  424</span>&#160;    request_dict_.SetDouble(<span class="stringliteral">&quot;first_crypto_period_index&quot;</span>,</div>
+<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160;                            first_crypto_period_index);</div>
+<div class="line"><a name="l00426"></a><span class="lineno">  426</span>&#160;    request_dict_.SetInteger(<span class="stringliteral">&quot;crypto_period_count&quot;</span>, crypto_period_count_);</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;</div>
+<div class="line"><a name="l00429"></a><span class="lineno">  429</span>&#160;  base::JSONWriter::WriteWithOptions(</div>
+<div class="line"><a name="l00430"></a><span class="lineno">  430</span>&#160;      request_dict_,</div>
+<div class="line"><a name="l00431"></a><span class="lineno">  431</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="l00432"></a><span class="lineno">  432</span>&#160;      <span class="comment">// without using exponential notation or appending a &#39;.0&#39;.</span></div>
+<div class="line"><a name="l00433"></a><span class="lineno">  433</span>&#160;      base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, request);</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;Status WidevineKeySource::GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request,</div>
+<div class="line"><a name="l00437"></a><span class="lineno">  437</span>&#160;                                             std::string* message) {</div>
+<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160;  DCHECK(message);</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;  std::string request_base64_string;</div>
+<div class="line"><a name="l00441"></a><span class="lineno">  441</span>&#160;  base::Base64Encode(request, &amp;request_base64_string);</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;  base::DictionaryValue request_dict;</div>
+<div class="line"><a name="l00444"></a><span class="lineno">  444</span>&#160;  request_dict.SetString(<span class="stringliteral">&quot;request&quot;</span>, request_base64_string);</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="comment">// Sign the request.</span></div>
+<div class="line"><a name="l00447"></a><span class="lineno">  447</span>&#160;  <span class="keywordflow">if</span> (signer_) {</div>
+<div class="line"><a name="l00448"></a><span class="lineno">  448</span>&#160;    std::string signature;</div>
+<div class="line"><a name="l00449"></a><span class="lineno">  449</span>&#160;    <span class="keywordflow">if</span> (!signer_-&gt;GenerateSignature(request, &amp;signature))</div>
+<div class="line"><a name="l00450"></a><span class="lineno">  450</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="l00451"></a><span class="lineno">  451</span>&#160;</div>
+<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160;    std::string signature_base64_string;</div>
+<div class="line"><a name="l00453"></a><span class="lineno">  453</span>&#160;    base::Base64Encode(signature, &amp;signature_base64_string);</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;    request_dict.SetString(<span class="stringliteral">&quot;signature&quot;</span>, signature_base64_string);</div>
+<div class="line"><a name="l00456"></a><span class="lineno">  456</span>&#160;    request_dict.SetString(<span class="stringliteral">&quot;signer&quot;</span>, signer_-&gt;signer_name());</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;  base::JSONWriter::Write(request_dict, message);</div>
+<div class="line"><a name="l00460"></a><span class="lineno">  460</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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="keywordtype">bool</span> WidevineKeySource::DecodeResponse(</div>
+<div class="line"><a name="l00464"></a><span class="lineno">  464</span>&#160;    <span class="keyword">const</span> std::string&amp; raw_response,</div>
+<div class="line"><a name="l00465"></a><span class="lineno">  465</span>&#160;    std::string* response) {</div>
+<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160;  DCHECK(response);</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="comment">// Extract base64 formatted response from JSON formatted raw response.</span></div>
+<div class="line"><a name="l00469"></a><span class="lineno">  469</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="l00470"></a><span class="lineno">  470</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(</div>
+<div class="line"><a name="l00471"></a><span class="lineno">  471</span>&#160;      base::JSONReader::Read(raw_response).release());</div>
+<div class="line"><a name="l00472"></a><span class="lineno">  472</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
+<div class="line"><a name="l00473"></a><span class="lineno">  473</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="l00474"></a><span class="lineno">  474</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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="keyword">const</span> base::DictionaryValue* response_dict = NULL;</div>
+<div class="line"><a name="l00477"></a><span class="lineno">  477</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;response_dict));</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::string response_base64_string;</div>
+<div class="line"><a name="l00480"></a><span class="lineno">  480</span>&#160;  RCHECK(response_dict-&gt;GetString(<span class="stringliteral">&quot;response&quot;</span>, &amp;response_base64_string));</div>
+<div class="line"><a name="l00481"></a><span class="lineno">  481</span>&#160;  RCHECK(base::Base64Decode(response_base64_string, response));</div>
+<div class="line"><a name="l00482"></a><span class="lineno">  482</span>&#160;  <span class="keywordflow">return</span> <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;</div>
+<div class="line"><a name="l00485"></a><span class="lineno">  485</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::ExtractEncryptionKey(</div>
+<div class="line"><a name="l00486"></a><span class="lineno">  486</span>&#160;    <span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00487"></a><span class="lineno">  487</span>&#160;    <span class="keywordtype">bool</span> widevine_classic,</div>
+<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160;    <span class="keyword">const</span> std::string&amp; response,</div>
+<div class="line"><a name="l00489"></a><span class="lineno">  489</span>&#160;    <span class="keywordtype">bool</span>* transient_error) {</div>
+<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160;  DCHECK(transient_error);</div>
+<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;  *transient_error = <span class="keyword">false</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;  <span class="comment">// TODO(kqyang): Remove &quot;.release()&quot; when base is updated to use unique_ptr.</span></div>
+<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160;  std::unique_ptr&lt;base::Value&gt; root(base::JSONReader::Read(response).release());</div>
+<div class="line"><a name="l00495"></a><span class="lineno">  495</span>&#160;  <span class="keywordflow">if</span> (!root) {</div>
+<div class="line"><a name="l00496"></a><span class="lineno">  496</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="l00497"></a><span class="lineno">  497</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
+<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160;  <span class="keyword">const</span> base::DictionaryValue* license_dict = NULL;</div>
+<div class="line"><a name="l00501"></a><span class="lineno">  501</span>&#160;  RCHECK(root-&gt;GetAsDictionary(&amp;license_dict));</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;  std::string license_status;</div>
+<div class="line"><a name="l00504"></a><span class="lineno">  504</span>&#160;  RCHECK(license_dict-&gt;GetString(<span class="stringliteral">&quot;status&quot;</span>, &amp;license_status));</div>
+<div class="line"><a name="l00505"></a><span class="lineno">  505</span>&#160;  <span class="keywordflow">if</span> (license_status != kLicenseStatusOK) {</div>
+<div class="line"><a name="l00506"></a><span class="lineno">  506</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="l00507"></a><span class="lineno">  507</span>&#160;    *transient_error = (license_status == kLicenseStatusTransientError);</div>
+<div class="line"><a name="l00508"></a><span class="lineno">  508</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  <span class="keyword">const</span> base::ListValue* tracks;</div>
+<div class="line"><a name="l00512"></a><span class="lineno">  512</span>&#160;  RCHECK(license_dict-&gt;GetList(<span class="stringliteral">&quot;tracks&quot;</span>, &amp;tracks));</div>
+<div class="line"><a name="l00513"></a><span class="lineno">  513</span>&#160;  <span class="comment">// Should have at least one track per crypto_period.</span></div>
+<div class="line"><a name="l00514"></a><span class="lineno">  514</span>&#160;  RCHECK(enable_key_rotation ? tracks-&gt;GetSize() &gt;= 1 * crypto_period_count_</div>
+<div class="line"><a name="l00515"></a><span class="lineno">  515</span>&#160;                             : tracks-&gt;GetSize() &gt;= 1);</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="keywordtype">int</span> current_crypto_period_index = first_crypto_period_index_;</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;  EncryptionKeyMap encryption_key_map;</div>
+<div class="line"><a name="l00520"></a><span class="lineno">  520</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="l00521"></a><span class="lineno">  521</span>&#160;    <span class="keyword">const</span> base::DictionaryValue* track_dict;</div>
+<div class="line"><a name="l00522"></a><span class="lineno">  522</span>&#160;    RCHECK(tracks-&gt;GetDictionary(i, &amp;track_dict));</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="keywordflow">if</span> (enable_key_rotation) {</div>
+<div class="line"><a name="l00525"></a><span class="lineno">  525</span>&#160;      <span class="keywordtype">int</span> crypto_period_index;</div>
+<div class="line"><a name="l00526"></a><span class="lineno">  526</span>&#160;      RCHECK(</div>
+<div class="line"><a name="l00527"></a><span class="lineno">  527</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="l00528"></a><span class="lineno">  528</span>&#160;      <span class="keywordflow">if</span> (crypto_period_index != current_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 + 1) {</div>
+<div class="line"><a name="l00530"></a><span class="lineno">  530</span>&#160;          LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Expecting crypto period index &quot;</span></div>
+<div class="line"><a name="l00531"></a><span class="lineno">  531</span>&#160;                     &lt;&lt; current_crypto_period_index &lt;&lt; <span class="stringliteral">&quot; or &quot;</span></div>
+<div class="line"><a name="l00532"></a><span class="lineno">  532</span>&#160;                     &lt;&lt; current_crypto_period_index + 1 &lt;&lt; <span class="stringliteral">&quot;; Seen &quot;</span></div>
+<div class="line"><a name="l00533"></a><span class="lineno">  533</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="l00534"></a><span class="lineno">  534</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</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;        <span class="keywordflow">if</span> (!PushToKeyPool(&amp;encryption_key_map))</div>
+<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160;          <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00538"></a><span class="lineno">  538</span>&#160;        ++current_crypto_period_index;</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;    }</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;    std::string track_type_str;</div>
+<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160;    RCHECK(track_dict-&gt;GetString(<span class="stringliteral">&quot;type&quot;</span>, &amp;track_type_str));</div>
+<div class="line"><a name="l00544"></a><span class="lineno">  544</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="l00545"></a><span class="lineno">  545</span>&#160;    DCHECK_NE(TRACK_TYPE_UNKNOWN, track_type);</div>
+<div class="line"><a name="l00546"></a><span class="lineno">  546</span>&#160;    RCHECK(encryption_key_map.find(track_type) == encryption_key_map.end());</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;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> EncryptionKey());</div>
+<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160;</div>
+<div class="line"><a name="l00550"></a><span class="lineno">  550</span>&#160;    <span class="keywordflow">if</span> (!GetKeyFromTrack(*track_dict, &amp;encryption_key-&gt;key))</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;    <span class="comment">// Get key ID and PSSH data for CENC content only.</span></div>
+<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;    <span class="keywordflow">if</span> (!widevine_classic) {</div>
+<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160;      <span class="keywordflow">if</span> (!GetKeyIdFromTrack(*track_dict, &amp;encryption_key-&gt;key_id))</div>
+<div class="line"><a name="l00556"></a><span class="lineno">  556</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;      ProtectionSystemSpecificInfo info;</div>
+<div class="line"><a name="l00559"></a><span class="lineno">  559</span>&#160;      info.add_key_id(encryption_key-&gt;key_id);</div>
+<div class="line"><a name="l00560"></a><span class="lineno">  560</span>&#160;      info.set_system_id(kWidevineSystemId, arraysize(kWidevineSystemId));</div>
+<div class="line"><a name="l00561"></a><span class="lineno">  561</span>&#160;      info.set_pssh_box_version(0);</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;      std::vector&lt;uint8_t&gt; pssh_data;</div>
+<div class="line"><a name="l00564"></a><span class="lineno">  564</span>&#160;      <span class="keywordflow">if</span> (!GetPsshDataFromTrack(*track_dict, &amp;pssh_data))</div>
+<div class="line"><a name="l00565"></a><span class="lineno">  565</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00566"></a><span class="lineno">  566</span>&#160;      info.set_pssh_data(pssh_data);</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;      encryption_key-&gt;key_system_info.push_back(info);</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;    encryption_key_map[track_type] = encryption_key.release();</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;</div>
+<div class="line"><a name="l00573"></a><span class="lineno">  573</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="l00574"></a><span class="lineno">  574</span>&#160;  <span class="comment">// key IDs of all the keys.</span></div>
+<div class="line"><a name="l00575"></a><span class="lineno">  575</span>&#160;  <span class="keywordflow">if</span> (add_common_pssh_ &amp;&amp; !widevine_classic) {</div>
+<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160;    std::set&lt;std::vector&lt;uint8_t&gt;&gt; key_ids;</div>
+<div class="line"><a name="l00577"></a><span class="lineno">  577</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="l00578"></a><span class="lineno">  578</span>&#160;      key_ids.insert(pair.second-&gt;key_id);</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;</div>
+<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160;    <span class="comment">// Create a common system PSSH box.</span></div>
+<div class="line"><a name="l00582"></a><span class="lineno">  582</span>&#160;    ProtectionSystemSpecificInfo info;</div>
+<div class="line"><a name="l00583"></a><span class="lineno">  583</span>&#160;    info.set_system_id(kCommonSystemId, arraysize(kCommonSystemId));</div>
+<div class="line"><a name="l00584"></a><span class="lineno">  584</span>&#160;    info.set_pssh_box_version(1);</div>
+<div class="line"><a name="l00585"></a><span class="lineno">  585</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="l00586"></a><span class="lineno">  586</span>&#160;      info.add_key_id(key_id);</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;</div>
-<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;  DCHECK(!encryption_key_map.empty());</div>
-<div class="line"><a name="l00591"></a><span class="lineno">  591</span>&#160;  <span class="keywordflow">if</span> (!enable_key_rotation) {</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;    encryption_key_map_ = encryption_key_map;</div>
-<div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</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="keywordflow">return</span> PushToKeyPool(&amp;encryption_key_map);</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;</div>
-<div class="line"><a name="l00598"></a><span class="lineno">  598</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::PushToKeyPool(</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160;    EncryptionKeyMap* encryption_key_map) {</div>
-<div class="line"><a name="l00600"></a><span class="lineno">  600</span>&#160;  DCHECK(key_pool_);</div>
-<div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  DCHECK(encryption_key_map);</div>
-<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;  Status status =</div>
-<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;      key_pool_-&gt;Push(scoped_refptr&lt;RefCountedEncryptionKeyMap&gt;(</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;                          <span class="keyword">new</span> RefCountedEncryptionKeyMap(encryption_key_map)),</div>
-<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;                      kInfiniteTimeout);</div>
-<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  encryption_key_map-&gt;clear();</div>
-<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;    DCHECK_EQ(error::STOPPED, status.error_code());</div>
-<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
-<div class="line"><a name="l00614"></a><span class="lineno">  614</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;}  <span class="comment">// namespace shaka</span></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;    <span class="keywordflow">for</span> (<span class="keyword">const</span> EncryptionKeyMap::value_type&amp; pair : encryption_key_map) {</div>
+<div class="line"><a name="l00590"></a><span class="lineno">  590</span>&#160;      pair.second-&gt;key_system_info.push_back(info);</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;</div>
+<div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;  DCHECK(!encryption_key_map.empty());</div>
+<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160;  <span class="keywordflow">if</span> (!enable_key_rotation) {</div>
+<div class="line"><a name="l00596"></a><span class="lineno">  596</span>&#160;    encryption_key_map_ = encryption_key_map;</div>
+<div class="line"><a name="l00597"></a><span class="lineno">  597</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;  <span class="keywordflow">return</span> PushToKeyPool(&amp;encryption_key_map);</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;</div>
+<div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;<span class="keywordtype">bool</span> WidevineKeySource::PushToKeyPool(</div>
+<div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;    EncryptionKeyMap* encryption_key_map) {</div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;  DCHECK(key_pool_);</div>
+<div class="line"><a name="l00605"></a><span class="lineno">  605</span>&#160;  DCHECK(encryption_key_map);</div>
+<div class="line"><a name="l00606"></a><span class="lineno">  606</span>&#160;  Status status =</div>
+<div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;      key_pool_-&gt;Push(scoped_refptr&lt;RefCountedEncryptionKeyMap&gt;(</div>
+<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160;                          <span class="keyword">new</span> RefCountedEncryptionKeyMap(encryption_key_map)),</div>
+<div class="line"><a name="l00609"></a><span class="lineno">  609</span>&#160;                      kInfiniteTimeout);</div>
+<div class="line"><a name="l00610"></a><span class="lineno">  610</span>&#160;  encryption_key_map-&gt;clear();</div>
+<div class="line"><a name="l00611"></a><span class="lineno">  611</span>&#160;  <span class="keywordflow">if</span> (!status.ok()) {</div>
+<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160;    DCHECK_EQ(error::STOPPED, status.error_code());</div>
+<div class="line"><a name="l00613"></a><span class="lineno">  613</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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="keywordflow">return</span> <span class="keyword">true</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;</div>
+<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00619"></a><span class="lineno">  619</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_abdff0d3cc5f59b744c68b11b0c1f6272"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(scoped_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00280">widevine_key_source.cc:280</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#l00175">widevine_key_source.cc:175</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#l00258">widevine_key_source.cc:258</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#l00232">widevine_key_source.cc:232</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_afc5154b2994b5fe1f8f0c494bbd2bcdd"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(scoped_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00284">widevine_key_source.cc:284</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#l00031">widevine_key_source.h:31</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#l00020">key_source.h:20</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#l00284">widevine_key_source.cc:284</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_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#l00280">widevine_key_source.cc:280</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 340fa80be8..2acccb78df 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 ad051f2876..7029f700b3 100644
--- a/docs/d5/d8f/webm__cluster__parser_8cc_source.html
+++ b/docs/d5/d8f/webm__cluster__parser_8cc_source.html
@@ -445,7 +445,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;    <span class="comment">// Every encrypted Block has a signal byte and IV prepended to it. Current</span></div>
 <div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;    <span class="comment">// encrypted WebM request for comments specification is here</span></div>
 <div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;    <span class="comment">// http://wiki.webmproject.org/encryption/webm-encryption-rfc</span></div>
-<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    scoped_ptr&lt;DecryptConfig&gt; decrypt_config;</div>
+<div class="line"><a name="l00359"></a><span class="lineno">  359</span>&#160;    std::unique_ptr&lt;DecryptConfig&gt; decrypt_config;</div>
 <div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    <span class="keywordtype">int</span> data_offset = 0;</div>
 <div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;    <span class="keywordflow">if</span> (!encryption_key_id.empty() &amp;&amp;</div>
 <div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;        !WebMCreateDecryptConfig(</div>
@@ -500,7 +500,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00411"></a><span class="lineno">  411</span>&#160;      streams.push_back(audio_stream_info_);</div>
 <div class="line"><a name="l00412"></a><span class="lineno">  412</span>&#160;    <span class="keywordflow">if</span> (video_stream_info_) {</div>
 <div class="line"><a name="l00413"></a><span class="lineno">  413</span>&#160;      <span class="keywordflow">if</span> (stream_type == kStreamVideo) {</div>
-<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;        scoped_ptr&lt;VPxParser&gt; vpx_parser;</div>
+<div class="line"><a name="l00414"></a><span class="lineno">  414</span>&#160;        std::unique_ptr&lt;VPxParser&gt; vpx_parser;</div>
 <div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160;        <span class="keywordflow">switch</span> (video_stream_info_-&gt;codec()) {</div>
 <div class="line"><a name="l00416"></a><span class="lineno">  416</span>&#160;          <span class="keywordflow">case</span> kCodecVP8:</div>
 <div class="line"><a name="l00417"></a><span class="lineno">  417</span>&#160;            vpx_parser.reset(<span class="keyword">new</span> VP8Parser);</div>
@@ -704,14 +704,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">// namespace media</span></div>
 <div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;}  <span class="comment">// namespace shaka</span></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#l00035">media_parser.h:35</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_1WebMClusterParser_html_aba1bae97c2d96181027e43b0a1993e67"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#aba1bae97c2d96181027e43b0a1993e67">shaka::media::WebMClusterParser::Parse</a></div><div class="ttdeci">int Parse(const uint8_t *buf, int size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00090">webm_cluster_parser.cc:90</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMListParser_html_a4ebac4e1a4165017d206d4aa5c4c0350"><div class="ttname"><a href="../../dc/dca/classshaka_1_1media_1_1WebMListParser.html#a4ebac4e1a4165017d206d4aa5c4c0350">shaka::media::WebMListParser::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Resets the state of the parser so it can start parsing a new list. </div><div class="ttdef"><b>Definition:</b> <a href="../../d3/db6/webm__parser_8cc_source.html#l00714">webm_parser.cc:714</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_1WebMClusterParser_html_ac3d4be1a12667ed722915be727747eee"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#ac3d4be1a12667ed722915be727747eee">shaka::media::WebMClusterParser::Flush</a></div><div class="ttdeci">bool Flush() WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00082">webm_cluster_parser.cc:82</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMWebVTTParser_html_a4e6f754e4fba24f7ea77fd0db959908b"><div class="ttname"><a href="../../d4/d59/classshaka_1_1media_1_1WebMWebVTTParser.html#a4e6f754e4fba24f7ea77fd0db959908b">shaka::media::WebMWebVTTParser::Parse</a></div><div class="ttdeci">static void Parse(const uint8_t *payload, int payload_size, std::string *id, std::string *settings, std::string *content)</div><div class="ttdoc">Utility function to parse the WebVTT cue from a byte stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dc1/webm__webvtt__parser_8cc_source.html#l00010">webm_webvtt_parser.cc:10</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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_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#l00028">webm_cluster_parser.cc:28</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>
@@ -721,7 +721,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 cd0725aa6f..99bfc0ed20 100644
--- a/docs/d5/d91/es__parser__adts_8cc_source.html
+++ b/docs/d5/d91/es__parser__adts_8cc_source.html
@@ -366,7 +366,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4813e055bc..d14099fc89 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d4e38134ca..c07f8cd3a9 100644
--- a/docs/d5/d98/encryptor_8cc_source.html
+++ b/docs/d5/d98/encryptor_8cc_source.html
@@ -263,7 +263,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;                                  Codec codec,</div>
 <div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;                                  <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
 <div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;                                  <span class="keywordtype">bool</span> webm_subsample_encryption) {</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
 <div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = key_source-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(track_type, encryption_key.get());</div>
 <div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">return</span> status;</div>
@@ -272,7 +272,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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::INTERNAL_ERROR, <span class="stringliteral">&quot;Failed to generate random iv.&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;  DCHECK_EQ(kWebMIvSize, encryption_key-&gt;iv.size());</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  scoped_ptr&lt;AesCtrEncryptor&gt; encryptor(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>());</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  std::unique_ptr&lt;AesCtrEncryptor&gt; encryptor(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>());</div>
 <div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> initialized =</div>
 <div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      encryptor-&gt;InitializeWithIv(encryption_key-&gt;key, encryption_key-&gt;iv);</div>
 <div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  <span class="keywordflow">if</span> (!initialized)</div>
@@ -290,8 +290,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;        encryptor-&gt;iv(), encryption_key-&gt;key_system_info);</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;  key_ = encryption_key.Pass();</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  encryptor_ = encryptor.Pass();</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  key_ = std::move(encryption_key);</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  encryptor_ = std::move(encryptor);</div>
 <div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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;</div>
@@ -305,18 +305,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_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#l00020">key_source.h:20</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_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#l00043">aes_encryptor.h:43</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>
 <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#l00031">key_source.h:31</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 a12b94f2d1..2cf06981c8 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 07589ab09b..e2bd74df45 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 6bf458d943..3359659b54 100644
--- a/docs/d5/da4/aes__encryptor_8cc_source.html
+++ b/docs/d5/da4/aes__encryptor_8cc_source.html
@@ -290,14 +290,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1AesCbcEncryptor_html_a2cc8f20b92d884d959b3a586b527fece"><div class="ttname"><a href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece">shaka::media::AesCbcEncryptor::AesCbcEncryptor</a></div><div class="ttdeci">AesCbcEncryptor(CbcPaddingScheme padding_scheme)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/da4/aes__encryptor_8cc_source.html#l00099">aes_encryptor.cc:99</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesEncryptor_html_a0695df5615cadf6977fdbac978daeffa"><div class="ttname"><a href="../../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa">shaka::media::AesEncryptor::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="../../d5/da4/aes__encryptor_8cc_source.html#l00039">aes_encryptor.cc:39</a></div></div>
 <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#l00078">aes_encryptor.h:78</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_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#l00022">aes_encryptor.h:22</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6ec0235d38..cd21f4e7fc 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 00bc46b40a..d45384c473 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d290092e89..e54d860d98 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
@@ -113,9 +113,9 @@ Public Member Functions</h2></td></tr>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>Reset</b> () override</td></tr>
 <tr class="separator:a2c2a28f9727411b25bf0bd31b2e9c5e3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x')"><img src="../../closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td></tr>
-<tr class="memitem:a1ad0d1d76943970a6e16f3d95b732798 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1ad0d1d76943970a6e16f3d95b732798"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, scoped_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
-<tr class="separator:a1ad0d1d76943970a6e16f3d95b732798 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2f10c5ee6ede293c7e53056d806533f5 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2f10c5ee6ede293c7e53056d806533f5"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, std::unique_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
+<tr class="separator:a2f10c5ee6ede293c7e53056d806533f5 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac0fdc73889cbc5d3a83cc7cff29259b8 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac0fdc73889cbc5d3a83cc7cff29259b8"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>Parse</b> (const uint8_t *buf, int size, int64_t pts, int64_t dts) override</td></tr>
 <tr class="separator:ac0fdc73889cbc5d3a83cc7cff29259b8 inherit pub_methods_classshaka_1_1media_1_1mp2t_1_1EsParserH26x"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -153,7 +153,7 @@ const <br class="typebreak"/>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../d1/d37/es__parser__h264_8h_source.html#l00026">26</a> of file <a class="el" href="../../d1/d37/es__parser__h264_8h_source.html">es_parser_h264.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d1/d37/es__parser__h264_8h_source.html#l00025">25</a> of file <a class="el" href="../../d1/d37/es__parser__h264_8h_source.html">es_parser_h264.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>media/formats/mp2t/<a class="el" href="../../d1/d37/es__parser__h264_8h_source.html">es_parser_h264.h</a></li>
 <li>media/formats/mp2t/<a class="el" href="../../d6/d17/es__parser__h264_8cc_source.html">es_parser_h264.cc</a></li>
@@ -161,7 +161,7 @@ const <br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 26d58715e9..a2a99c45a4 100644
--- a/docs/d5/dba/ts__packet_8cc_source.html
+++ b/docs/d5/dba/ts__packet_8cc_source.html
@@ -93,7 +93,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;</div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/ts_packet.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/memory/scoped_ptr.h&quot;</span></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/media/base/bit_reader.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/mp2t/mp2t_common.h&quot;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;</div>
@@ -146,7 +146,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  scoped_ptr&lt;TsPacket&gt; ts_packet(<span class="keyword">new</span> TsPacket());</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  std::unique_ptr&lt;TsPacket&gt; ts_packet(<span class="keyword">new</span> TsPacket());</div>
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">bool</span> status = ts_packet-&gt;ParseHeader(buf);</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordflow">if</span> (!status) {</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;Parsing header failed&quot;</span>;</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9580877dc5..682ca64680 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 24329b7355..957f245a31 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 f888566b4c..34b1d7750f 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 ebbfa219c1..d6a97ba8c7 100644
--- a/docs/d5/dcf/rsa__key_8h_source.html
+++ b/docs/d5/dcf/rsa__key_8h_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 3eee024afb..b33c212009 100644
--- a/docs/d5/dda/ts__section__psi_8h_source.html
+++ b/docs/d5/dda/ts__section__psi_8h_source.html
@@ -146,12 +146,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="preprocessor"></span></div>
 <div class="ttc" id="classshaka_1_1media_1_1BitReader_html"><div class="ttname"><a href="../../d6/da9/classshaka_1_1media_1_1BitReader.html">shaka::media::BitReader</a></div><div class="ttdoc">A class to read bit streams. </div><div class="ttdef"><b>Definition:</b> <a href="../../d4/dd3/bit__reader_8h_source.html#l00017">bit_reader.h:17</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSectionPsi_html"><div class="ttname"><a href="../../de/d7e/classshaka_1_1media_1_1mp2t_1_1TsSectionPsi.html">shaka::media::mp2t::TsSectionPsi</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dda/ts__section__psi_8h_source.html#l00019">ts_section_psi.h:19</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#l00020">byte_queue.h:20</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_1mp2t_1_1TsSection_html"><div class="ttname"><a href="../../da/d1c/classshaka_1_1media_1_1mp2t_1_1TsSection.html">shaka::media::mp2t::TsSection</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d1a/ts__section_8h_source.html#l00012">ts_section.h:12</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 77a9327124..19393b6dff 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 56aac4fd43..dac34c6057 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
@@ -103,12 +103,13 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:aa0346189f99b2f0fc2c71da1543155fa"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a72fdec2c03caf45fe447f61ecd4fd683"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">PushSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
 <tr class="separator:a72fdec2c03caf45fe447f61ecd4fd683"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a346abd50baa9a1e6e42a49ba60f5f916"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">SetEncryptionKey</a> (scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
-<tr class="separator:a346abd50baa9a1e6e42a49ba60f5f916"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:acc603c661a6e0c592091b8bde5a77e3a"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">SetEncryptionKey</a> (std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
+<tr class="separator:acc603c661a6e0c592091b8bde5a77e3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a27a700967eb692a8207fd5054263fc3a"><td class="memItemLeft" align="right" valign="top">virtual size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">NumberOfReadyPesPackets</a> ()</td></tr>
 <tr class="separator:a27a700967eb692a8207fd5054263fc3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a9834c58c732715a51c57a2a6385a761b"><td class="memItemLeft" align="right" valign="top">virtual scoped_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">GetNextPesPacket</a> ()</td></tr>
-<tr class="separator:a9834c58c732715a51c57a2a6385a761b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:acf11010f62ab9d2b46308f2cce8b3650"><td class="memItemLeft" align="right" valign="top">virtual std::unique_ptr<br class="typebreak"/>
+&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">GetNextPesPacket</a> ()</td></tr>
+<tr class="separator:acf11010f62ab9d2b46308f2cce8b3650"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a71ea0819224b94ba9df5c951424bc6b1"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">Flush</a> ()</td></tr>
 <tr class="separator:a71ea0819224b94ba9df5c951424bc6b1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
@@ -150,7 +151,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
 
 </div>
 </div>
-<a class="anchor" id="a9834c58c732715a51c57a2a6385a761b"></a>
+<a class="anchor" id="acf11010f62ab9d2b46308f2cce8b3650"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -158,7 +159,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
   <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">scoped_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt; shaka::media::mp2t::PesPacketGenerator::GetNextPesPacket </td>
+          <td class="memname">std::unique_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt; shaka::media::mp2t::PesPacketGenerator::GetNextPesPacket </td>
           <td>(</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
@@ -265,7 +266,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
 
 </div>
 </div>
-<a class="anchor" id="a346abd50baa9a1e6e42a49ba60f5f916"></a>
+<a class="anchor" id="acc603c661a6e0c592091b8bde5a77e3a"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -275,7 +276,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PesPacketGeneratorTe
         <tr>
           <td class="memname">bool shaka::media::mp2t::PesPacketGenerator::SetEncryptionKey </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt;&#160;</td>
           <td class="paramname"><em>encryption_key</em></td><td>)</td>
           <td></td>
         </tr>
@@ -306,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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 fd5f2b8b32..da9ece5acf 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 097cc3ece1..393a24300b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f8222ca27c..f53783f95e 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 89f9c727ac..ab65bb1312 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 cbbbe72b0f..fedfa58e8d 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 a8d92a93e0..38fe9815fc 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 b1f38ff896..7759fe778d 100644
--- a/docs/d5/dfc/file_8cc_source.html
+++ b/docs/d5/dfc/file_8cc_source.html
@@ -97,290 +97,287 @@ 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;gflags/gflags.h&gt;</span></div>
 <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="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 &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/memory/scoped_ptr.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/string_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/file/local_file.h&quot;</span></div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/memory_file.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/threaded_io_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/file/udp_file.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_util.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;DEFINE_uint64(io_cache_size,</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;              32ULL &lt;&lt; 20,</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;              <span class="stringliteral">&quot;Size of the threaded I/O cache, in bytes. Specify 0 to disable &quot;</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;              <span class="stringliteral">&quot;threaded I/O.&quot;</span>);</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;DEFINE_uint64(io_block_size,</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;              2ULL &lt;&lt; 20,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;              <span class="stringliteral">&quot;Size of the block size used for threaded I/O, in bytes.&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;<span class="comment">// Needed for Windows weirdness which somewhere defines CopyFile as CopyFileW.</span></div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#ifdef CopyFile</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#undef CopyFile</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#endif  // CopyFile</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor"></span></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">   36</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span>* kLocalFilePrefix = <span class="stringliteral">&quot;file://&quot;</span>;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span>* kUdpFilePrefix = <span class="stringliteral">&quot;udp://&quot;</span>;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span>* kMemoryFilePrefix = <span class="stringliteral">&quot;memory://&quot;</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="keyword">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;<span class="keyword">typedef</span> File* (*FileFactoryFunction)(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode);</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">typedef</span> bool (*FileDeleteFunction)(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name);</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="keyword">struct </span>SupportedTypeInfo {</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">char</span>* type;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keywordtype">size_t</span> type_length;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keyword">const</span> FileFactoryFunction factory_function;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keyword">const</span> FileDeleteFunction delete_function;</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;File* CreateLocalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> LocalFile(file_name, mode);</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">bool</span> DeleteLocalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d9/de6/classshaka_1_1media_1_1LocalFile.html#aab9c8faf7e459f38e2f8fb2d63e5bd59">LocalFile::Delete</a>(file_name);</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;File* CreateUdpFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordflow">if</span> (base::strcasecmp(mode, <span class="stringliteral">&quot;r&quot;</span>)) {</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;UdpFile only supports read (receive) mode.&quot;</span>;</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> <span class="keyword">new</span> UdpFile(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;File* CreateMemoryFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> MemoryFile(file_name, mode);</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="keywordtype">bool</span> DeleteMemoryFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <a class="code" href="../../d9/dbd/classshaka_1_1media_1_1MemoryFile.html#a1079b0a5e919c79cbc97e28f11ac8a81">MemoryFile::Delete</a>(file_name);</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> SupportedTypeInfo kSupportedTypeInfo[] = {</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;    kLocalFilePrefix,</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    strlen(kLocalFilePrefix),</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    &amp;CreateLocalFile,</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    &amp;DeleteLocalFile</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;    kUdpFilePrefix,</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    strlen(kUdpFilePrefix),</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    &amp;CreateUdpFile,</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    NULL</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;    kMemoryFilePrefix,</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    strlen(kMemoryFilePrefix),</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    &amp;CreateMemoryFile,</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    &amp;DeleteMemoryFile</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;</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;File* File::Create(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; internal_file(</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;      CreateInternalFile(file_name, mode));</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="keywordflow">if</span> (!strncmp(file_name, kMemoryFilePrefix, strlen(kMemoryFilePrefix))) {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="comment">// Disable caching for memory files.</span></div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordflow">return</span> internal_file.release();</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="keywordflow">if</span> (FLAGS_io_cache_size) {</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="comment">// Enable threaded I/O for &quot;r&quot;, &quot;w&quot;, and &quot;a&quot; modes only.</span></div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">if</span> (!strcmp(mode, <span class="stringliteral">&quot;r&quot;</span>)) {</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">new</span> ThreadedIoFile(internal_file.Pass(),</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;                                ThreadedIoFile::kInputMode,</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;                                FLAGS_io_cache_size,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                FLAGS_io_block_size);</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!strcmp(mode, <span class="stringliteral">&quot;w&quot;</span>) || !strcmp(mode, <span class="stringliteral">&quot;a&quot;</span>)) {</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">new</span> ThreadedIoFile(internal_file.Pass(),</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;                                ThreadedIoFile::kOutputMode,</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;                                FLAGS_io_cache_size,</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;                                FLAGS_io_block_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;  }</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="comment">// Threaded I/O is disabled.</span></div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  DLOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Threaded I/O is disabled. Performance may be decreased.&quot;</span>;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <span class="keywordflow">return</span> internal_file.release();</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;File* File::CreateInternalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; internal_file;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; arraysize(kSupportedTypeInfo); ++i) {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keyword">const</span> SupportedTypeInfo&amp; type_info = kSupportedTypeInfo[i];</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    <span class="keywordflow">if</span> (strncmp(type_info.type, file_name, type_info.type_length) == 0) {</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;      internal_file.reset(type_info.factory_function(</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;          file_name + type_info.type_length, mode));</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;  <span class="comment">// Otherwise we assume it is a local file</span></div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="keywordflow">if</span> (!internal_file)</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    internal_file.reset(CreateLocalFile(file_name, mode));</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;DEFINE_uint64(io_cache_size,</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;              32ULL &lt;&lt; 20,</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;              <span class="stringliteral">&quot;Size of the threaded I/O cache, in bytes. Specify 0 to disable &quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;              <span class="stringliteral">&quot;threaded I/O.&quot;</span>);</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;DEFINE_uint64(io_block_size,</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;              2ULL &lt;&lt; 20,</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;              <span class="stringliteral">&quot;Size of the block size used for threaded I/O, in bytes.&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="comment">// Needed for Windows weirdness which somewhere defines CopyFile as CopyFileW.</span></div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#ifdef CopyFile</span></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#undef CopyFile</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#endif  // CopyFile</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">const</span> <span class="keywordtype">char</span>* kLocalFilePrefix = <span class="stringliteral">&quot;file://&quot;</span>;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span>* kUdpFilePrefix = <span class="stringliteral">&quot;udp://&quot;</span>;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">const</span> <span class="keywordtype">char</span>* kMemoryFilePrefix = <span class="stringliteral">&quot;memory://&quot;</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;<span class="keyword">namespace </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="keyword">typedef</span> File* (*FileFactoryFunction)(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode);</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="keyword">typedef</span> bool (*FileDeleteFunction)(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name);</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">struct </span>SupportedTypeInfo {</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">char</span>* type;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordtype">size_t</span> type_length;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keyword">const</span> FileFactoryFunction factory_function;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keyword">const</span> FileDeleteFunction delete_function;</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;File* CreateLocalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> LocalFile(file_name, mode);</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">bool</span> DeleteLocalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d9/de6/classshaka_1_1media_1_1LocalFile.html#aab9c8faf7e459f38e2f8fb2d63e5bd59">LocalFile::Delete</a>(file_name);</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;File* CreateUdpFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordflow">if</span> (base::strcasecmp(mode, <span class="stringliteral">&quot;r&quot;</span>)) {</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    NOTIMPLEMENTED() &lt;&lt; <span class="stringliteral">&quot;UdpFile only supports read (receive) mode.&quot;</span>;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="keywordflow">return</span> NULL;</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="keywordflow">return</span> <span class="keyword">new</span> UdpFile(file_name);</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">   67</span>&#160;File* CreateMemoryFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">new</span> MemoryFile(file_name, mode);</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="keywordtype">bool</span> DeleteMemoryFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <a class="code" href="../../d9/dbd/classshaka_1_1media_1_1MemoryFile.html#a1079b0a5e919c79cbc97e28f11ac8a81">MemoryFile::Delete</a>(file_name);</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</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;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> SupportedTypeInfo kSupportedTypeInfo[] = {</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;    kLocalFilePrefix,</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    strlen(kLocalFilePrefix),</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    &amp;CreateLocalFile,</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    &amp;DeleteLocalFile</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;    kUdpFilePrefix,</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    strlen(kUdpFilePrefix),</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    &amp;CreateUdpFile,</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    NULL</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;  {</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    kMemoryFilePrefix,</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    strlen(kMemoryFilePrefix),</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    &amp;CreateMemoryFile,</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    &amp;DeleteMemoryFile</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;</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;File* File::Create(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; internal_file(</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;      CreateInternalFile(file_name, mode));</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="keywordflow">if</span> (!strncmp(file_name, kMemoryFilePrefix, strlen(kMemoryFilePrefix))) {</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="comment">// Disable caching for memory files.</span></div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="keywordflow">return</span> internal_file.release();</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="keywordflow">if</span> (FLAGS_io_cache_size) {</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="comment">// Enable threaded I/O for &quot;r&quot;, &quot;w&quot;, and &quot;a&quot; modes only.</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="keywordflow">if</span> (!strcmp(mode, <span class="stringliteral">&quot;r&quot;</span>)) {</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">new</span> ThreadedIoFile(std::move(internal_file),</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;                                ThreadedIoFile::kInputMode, FLAGS_io_cache_size,</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;                                FLAGS_io_block_size);</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!strcmp(mode, <span class="stringliteral">&quot;w&quot;</span>) || !strcmp(mode, <span class="stringliteral">&quot;a&quot;</span>)) {</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">new</span> ThreadedIoFile(std::move(internal_file),</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                ThreadedIoFile::kOutputMode,</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;                                FLAGS_io_cache_size, FLAGS_io_block_size);</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;  }</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">// Threaded I/O is disabled.</span></div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  DLOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Threaded I/O is disabled. Performance may be decreased.&quot;</span>;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  <span class="keywordflow">return</span> internal_file.release();</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;File* File::CreateInternalFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; internal_file;</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; arraysize(kSupportedTypeInfo); ++i) {</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    <span class="keyword">const</span> SupportedTypeInfo&amp; type_info = kSupportedTypeInfo[i];</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    <span class="keywordflow">if</span> (strncmp(type_info.type, file_name, type_info.type_length) == 0) {</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;      internal_file.reset(type_info.factory_function(</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;          file_name + type_info.type_length, mode));</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">// Otherwise we assume it is a local file</span></div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  <span class="keywordflow">if</span> (!internal_file)</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    internal_file.reset(CreateLocalFile(file_name, mode));</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="keywordflow">return</span> internal_file.release();</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="keywordflow">return</span> internal_file.release();</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">  145</a></span>&#160;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = File::Create(file_name, mode);</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  <span class="keywordflow">if</span> (!file)</div>
+<div class="line"><a name="l00142"></a><span class="lineno"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">  142</a></span>&#160;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = File::Create(file_name, mode);</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keywordflow">if</span> (!file)</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  <span class="keywordflow">if</span> (!file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">Open</a>()) {</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;    <span class="keyword">delete</span> file;</div>
 <div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="keywordflow">if</span> (!file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">Open</a>()) {</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;    <span class="keyword">delete</span> file;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;    <span class="keywordflow">return</span> 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;  <span class="keywordflow">return</span> file;</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="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">  156</a></span>&#160;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">File::OpenWithNoBuffering</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = File::CreateInternalFile(file_name, mode);</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  <span class="keywordflow">if</span> (!file)</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> file;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">  153</a></span>&#160;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">File::OpenWithNoBuffering</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* mode) {</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = File::CreateInternalFile(file_name, mode);</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">if</span> (!file)</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;  <span class="keywordflow">if</span> (!file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">Open</a>()) {</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;    <span class="keyword">delete</span> file;</div>
 <div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    <span class="keywordflow">return</span> NULL;</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordflow">if</span> (!file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">Open</a>()) {</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;    <span class="keyword">delete</span> file;</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keywordflow">return</span> NULL;</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">return</span> file;</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="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">  167</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">File::Delete</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; arraysize(kSupportedTypeInfo); ++i) {</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    <span class="keyword">const</span> SupportedTypeInfo&amp; type_info = kSupportedTypeInfo[i];</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    <span class="keywordflow">if</span> (strncmp(type_info.type, file_name, type_info.type_length) == 0) {</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;      <span class="keywordflow">return</span> type_info.delete_function ?</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;          type_info.delete_function(file_name + type_info.type_length) :</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;          <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;  <span class="comment">// Otherwise we assume it is a local file</span></div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <span class="keywordflow">return</span> DeleteLocalFile(file_name);</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="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">  180</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">File::GetFileSize</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name, <span class="stringliteral">&quot;r&quot;</span>);</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  <span class="keywordflow">if</span> (!file)</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;    <span class="keywordflow">return</span> -1;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  int64_t res = file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#adffa2c3d12ae0a579704cf1f5b3bf8ab">Size</a>();</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;  file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;  <span class="keywordflow">return</span> res;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</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">return</span> file;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">  164</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">File::Delete</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; arraysize(kSupportedTypeInfo); ++i) {</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;    <span class="keyword">const</span> SupportedTypeInfo&amp; type_info = kSupportedTypeInfo[i];</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="keywordflow">if</span> (strncmp(type_info.type, file_name, type_info.type_length) == 0) {</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;      <span class="keywordflow">return</span> type_info.delete_function ?</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;          type_info.delete_function(file_name + type_info.type_length) :</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;          <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="comment">// Otherwise we assume it is a local file</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="keywordflow">return</span> DeleteLocalFile(file_name);</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;</div>
+<div class="line"><a name="l00177"></a><span class="lineno"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">  177</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">File::GetFileSize</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name, <span class="stringliteral">&quot;r&quot;</span>);</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">if</span> (!file)</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">return</span> -1;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  int64_t res = file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#adffa2c3d12ae0a579704cf1f5b3bf8ab">Size</a>();</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordflow">return</span> res;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">  186</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">File::ReadFileToString</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, std::string* contents) {</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;  DCHECK(contents);</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">  189</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">File::ReadFileToString</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name, std::string* contents) {</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  DCHECK(contents);</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;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name, <span class="stringliteral">&quot;r&quot;</span>);</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">if</span> (!file)</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="l00189"></a><span class="lineno">  189</span>&#160;  <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* file = <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(file_name, <span class="stringliteral">&quot;r&quot;</span>);</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keywordflow">if</span> (!file)</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;  <span class="keyword">const</span> <span class="keywordtype">size_t</span> kBufferSize = 0x40000;  <span class="comment">// 256KB.</span></div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  std::unique_ptr&lt;char[]&gt; buf(<span class="keyword">new</span> <span class="keywordtype">char</span>[kBufferSize]);</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> <span class="keywordtype">size_t</span> kBufferSize = 0x40000;  <span class="comment">// 256KB.</span></div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  scoped_ptr&lt;char[]&gt; buf(<span class="keyword">new</span> <span class="keywordtype">char</span>[kBufferSize]);</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;  int64_t len;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keywordflow">while</span> ((len = file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buf.get(), kBufferSize)) &gt; 0)</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    contents-&gt;append(buf.get(), len);</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;  file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  <span class="keywordflow">return</span> len == 0;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">  207</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">File::Copy</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* from_file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* to_file_name) {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  std::string content;</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">ReadFileToString</a>(from_file_name, &amp;content)) {</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to open file &quot;</span> &lt;&lt; from_file_name;</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;  scoped_ptr&lt;File, FileCloser&gt; output_file(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(to_file_name, <span class="stringliteral">&quot;w&quot;</span>));</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;  <span class="keywordflow">if</span> (!output_file) {</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to write to &quot;</span> &lt;&lt; to_file_name;</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;    <span class="keywordflow">return</span> <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">  220</span>&#160;  uint64_t bytes_left = content.size();</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  uint64_t total_bytes_written = 0;</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">char</span>* content_cstr = content.c_str();</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;  <span class="keywordflow">while</span> (bytes_left &gt; total_bytes_written) {</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;    <span class="keyword">const</span> int64_t bytes_written =</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;        output_file-&gt;Write(content_cstr + total_bytes_written, bytes_left);</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <span class="keywordflow">if</span> (bytes_written &lt; 0) {</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failure while writing to &quot;</span> &lt;&lt; to_file_name;</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;    total_bytes_written += bytes_written;</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">return</span> <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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">  236</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">File::CopyFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source, <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* destination) {</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">CopyFile</a>(source, destination, kWholeFile);</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a9f5ebcd3bdebb7fb02a7a7adf378b344">  240</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">File::CopyFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source, <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* destination, int64_t max_copy) {</div>
-<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;  DCHECK(source);</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  DCHECK(destination);</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;  <span class="keywordflow">if</span> (max_copy &lt; 0)</div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    max_copy = std::numeric_limits&lt;int64_t&gt;::max();</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="keyword">const</span> int64_t kBufferSize = 0x40000;  <span class="comment">// 256KB.</span></div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  scoped_ptr&lt;uint8_t[]&gt; buffer(<span class="keyword">new</span> uint8_t[kBufferSize]);</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;  int64_t bytes_copied = 0;</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;  <span class="keywordflow">while</span> (bytes_copied &lt; max_copy) {</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;    <span class="keyword">const</span> int64_t size = std::min(kBufferSize, max_copy - bytes_copied);</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    <span class="keyword">const</span> int64_t bytes_read = source-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer.get(), size);</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;    <span class="keywordflow">if</span> (bytes_read &lt; 0)</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;      <span class="keywordflow">return</span> bytes_read;</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;    <span class="keywordflow">if</span> (bytes_read == 0)</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;      <span class="keywordflow">break</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;    int64_t total_bytes_written = 0;</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;    <span class="keywordflow">while</span> (total_bytes_written &lt; bytes_read) {</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;      <span class="keyword">const</span> int64_t bytes_written = destination-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a3149670c0d085e71f0aa085ee87fdda5">Write</a>(</div>
-<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;          buffer.get() + total_bytes_written, bytes_read - total_bytes_written);</div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;      <span class="keywordflow">if</span> (bytes_written &lt; 0)</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;        <span class="keywordflow">return</span> bytes_written;</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  int64_t len;</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordflow">while</span> ((len = file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buf.get(), kBufferSize)) &gt; 0)</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    contents-&gt;append(buf.get(), len);</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;  file-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a2bfb0c180840356933652a795527b5c8">Close</a>();</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;  <span class="keywordflow">return</span> len == 0;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">  204</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#afacdff207ba8359eaa029d8b1414c641">File::Copy</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* from_file_name, <span class="keyword">const</span> <span class="keywordtype">char</span>* to_file_name) {</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  std::string content;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  <span class="keywordflow">if</span> (!<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a622dbc8abacebb40b816aa0174ba7c60">ReadFileToString</a>(from_file_name, &amp;content)) {</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to open file &quot;</span> &lt;&lt; from_file_name;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  std::unique_ptr&lt;File, FileCloser&gt; output_file(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(to_file_name, <span class="stringliteral">&quot;w&quot;</span>));</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="keywordflow">if</span> (!output_file) {</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to write to &quot;</span> &lt;&lt; to_file_name;</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;  uint64_t bytes_left = content.size();</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  uint64_t total_bytes_written = 0;</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">char</span>* content_cstr = content.c_str();</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordflow">while</span> (bytes_left &gt; total_bytes_written) {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keyword">const</span> int64_t bytes_written =</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;        output_file-&gt;Write(content_cstr + total_bytes_written, bytes_left);</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    <span class="keywordflow">if</span> (bytes_written &lt; 0) {</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failure while writing to &quot;</span> &lt;&lt; to_file_name;</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;    total_bytes_written += bytes_written;</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">  233</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">File::CopyFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source, <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* destination) {</div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">CopyFile</a>(source, destination, kWholeFile);</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"><a class="line" href="../../d3/d61/classshaka_1_1media_1_1File.html#a9f5ebcd3bdebb7fb02a7a7adf378b344">  237</a></span>&#160;int64_t <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">File::CopyFile</a>(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source, <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* destination, int64_t max_copy) {</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  DCHECK(source);</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  DCHECK(destination);</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keywordflow">if</span> (max_copy &lt; 0)</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;    max_copy = std::numeric_limits&lt;int64_t&gt;::max();</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="keyword">const</span> int64_t kBufferSize = 0x40000;  <span class="comment">// 256KB.</span></div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; buffer(<span class="keyword">new</span> uint8_t[kBufferSize]);</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;  int64_t bytes_copied = 0;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  <span class="keywordflow">while</span> (bytes_copied &lt; max_copy) {</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;    <span class="keyword">const</span> int64_t size = std::min(kBufferSize, max_copy - bytes_copied);</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;    <span class="keyword">const</span> int64_t bytes_read = source-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aed0c0793fd8751330583314a4d3012b9">Read</a>(buffer.get(), size);</div>
+<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;    <span class="keywordflow">if</span> (bytes_read &lt; 0)</div>
+<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;      <span class="keywordflow">return</span> bytes_read;</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    <span class="keywordflow">if</span> (bytes_read == 0)</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;      <span class="keywordflow">break</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;    int64_t total_bytes_written = 0;</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">while</span> (total_bytes_written &lt; bytes_read) {</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;      <span class="keyword">const</span> int64_t bytes_written = destination-&gt;<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#a3149670c0d085e71f0aa085ee87fdda5">Write</a>(</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;          buffer.get() + total_bytes_written, bytes_read - total_bytes_written);</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;      <span class="keywordflow">if</span> (bytes_written &lt; 0)</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;        <span class="keywordflow">return</span> bytes_written;</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;      total_bytes_written += bytes_written;</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;</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;      total_bytes_written += bytes_written;</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;    DCHECK_EQ(total_bytes_written, bytes_read);</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    bytes_copied += bytes_read;</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;  }</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    DCHECK_EQ(total_bytes_written, bytes_read);</div>
+<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;    bytes_copied += bytes_read;</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">return</span> bytes_copied;</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> bytes_copied;</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;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</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_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00156">file.cc:156</a></div></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#l00207">file.cc:207</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00153">file.cc:153</a></div></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#l00204">file.cc:204</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1File_html_adffa2c3d12ae0a579704cf1f5b3bf8ab"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#adffa2c3d12ae0a579704cf1f5b3bf8ab">shaka::media::File::Size</a></div><div class="ttdeci">virtual int64_t Size()=0</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_1File_html_a3149670c0d085e71f0aa085ee87fdda5"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a3149670c0d085e71f0aa085ee87fdda5">shaka::media::File::Write</a></div><div class="ttdeci">virtual int64_t Write(const void *buffer, uint64_t length)=0</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_1media_1_1File_html_a921efa1c8f7978e3b5aac33d648b0250"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">shaka::media::File::Open</a></div><div class="ttdeci">static File * Open(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00145">file.cc:145</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a921efa1c8f7978e3b5aac33d648b0250"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a921efa1c8f7978e3b5aac33d648b0250">shaka::media::File::Open</a></div><div class="ttdeci">static File * Open(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00142">file.cc:142</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MemoryFile_html_a1079b0a5e919c79cbc97e28f11ac8a81"><div class="ttname"><a href="../../d9/dbd/classshaka_1_1media_1_1MemoryFile.html#a1079b0a5e919c79cbc97e28f11ac8a81">shaka::media::MemoryFile::Delete</a></div><div class="ttdeci">static void Delete(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d87/memory__file_8cc_source.html#l00134">memory_file.cc:134</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_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00236">file.cc:236</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00180">file.cc:180</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#l00189">file.cc:189</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00233">file.cc:233</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00177">file.cc:177</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#l00186">file.cc:186</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1LocalFile_html_aab9c8faf7e459f38e2f8fb2d63e5bd59"><div class="ttname"><a href="../../d9/de6/classshaka_1_1media_1_1LocalFile.html#aab9c8faf7e459f38e2f8fb2d63e5bd59">shaka::media::LocalFile::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de8/local__file_8cc_source.html#l00104">local_file.cc:104</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00167">file.cc:167</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00164">file.cc:164</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6be2d255b6..4088b6cda4 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d6c24923d5..f76561aca3 100644
--- a/docs/d6/d09/aes__pattern__cryptor_8h_source.html
+++ b/docs/d6/d09/aes__pattern__cryptor_8h_source.html
@@ -95,60 +95,61 @@ 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 &quot;packager/base/macros.h&quot;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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="l00016"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">   16</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a> : <span class="keyword">public</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> {</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00020"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">   20</a></span>&#160;  <span class="keyword">enum</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> {</div>
-<div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">   25</a></span>&#160;    <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">kEncryptIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">   34</a></span>&#160;    <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">kSkipIfCryptByteBlockRemaining</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="l00052"></a><span class="lineno">   52</span>&#160;  <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">AesPatternCryptor</a>(uint8_t crypt_byte_block,</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                    uint8_t skip_byte_block,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                    <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                    ConstantIvFlag constant_iv_flag,</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                    scoped_ptr&lt;AesCryptor&gt; cryptor);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  ~<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">InitializeWithIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key,</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;                        <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>) <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* text,</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                     <span class="keywordtype">size_t</span> text_size,</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;                     uint8_t* crypt_text,</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;                     <span class="keywordtype">size_t</span>* crypt_text_size) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</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;  <span class="keywordtype">bool</span> NeedEncrypt(<span class="keywordtype">size_t</span> input_size, <span class="keywordtype">size_t</span> target_data_size);</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> uint8_t crypt_byte_block_;</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="keyword">const</span> uint8_t skip_byte_block_;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode_;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  scoped_ptr&lt;AesCryptor&gt; cryptor_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>);</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;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&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/macros.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="l00017"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">   17</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a> : <span class="keyword">public</span> <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a> {</div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">   21</a></span>&#160;  <span class="keyword">enum</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> {</div>
+<div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">   26</a></span>&#160;    <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">kEncryptIfCryptByteBlockRemaining</a>,</div>
+<div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">   35</a></span>&#160;    <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a09674e418b61763fdc5cf22c248efd4f">kSkipIfCryptByteBlockRemaining</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="l00053"></a><span class="lineno">   53</span>&#160;  <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">AesPatternCryptor</a>(uint8_t crypt_byte_block,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                    uint8_t 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#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                    ConstantIvFlag constant_iv_flag,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                    std::unique_ptr&lt;AesCryptor&gt; cryptor);</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  ~<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>() <span class="keyword">override</span>;</div>
+<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">bool</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">InitializeWithIv</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key,</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;                        <span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a96dde16f12a82a563c77f6d5522571f3">iv</a>) <span class="keyword">override</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; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">bool</span> CryptInternal(<span class="keyword">const</span> uint8_t* text,</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;                     <span class="keywordtype">size_t</span> text_size,</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;                     uint8_t* crypt_text,</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;                     <span class="keywordtype">size_t</span>* crypt_text_size) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="keywordtype">void</span> SetIvInternal() <span class="keyword">override</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;  <span class="keywordtype">bool</span> NeedEncrypt(<span class="keywordtype">size_t</span> input_size, <span class="keywordtype">size_t</span> target_data_size);</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> uint8_t crypt_byte_block_;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keyword">const</span> uint8_t skip_byte_block_;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  std::unique_ptr&lt;AesCryptor&gt; cryptor_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>);</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_1AesPatternCryptor_html_af878688f0f277f3f6757e85654439c34"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">shaka::media::AesPatternCryptor::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="../../de/d22/aes__pattern__cryptor_8cc_source.html#l00037">aes_pattern_cryptor.cc:37</a></div></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_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#l00034">aes_pattern_cryptor.h:34</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_ad76aebd0a9f7cc78f6f841cbce359107"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">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, scoped_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 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#l00025">aes_pattern_cryptor.h:25</a></div></div>
+<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_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_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#l00020">aes_pattern_cryptor.h:20</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00016">aes_pattern_cryptor.h:16</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_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00017">aes_pattern_cryptor.h:17</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9656fd4245..21f2da39b4 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 4c13b3c14e..87e86f653c 100644
--- a/docs/d6/d17/es__parser__h264_8cc_source.html
+++ b/docs/d6/d17/es__parser__h264_8cc_source.html
@@ -112,7 +112,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                           <span class="keyword">const</span> NewStreamInfoCB&amp; new_stream_info_cb,</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                           <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb)</div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    : EsParserH26x(Nalu::kH264,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                   scoped_ptr&lt;H26xByteToUnitStreamConverter&gt;(</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                   std::unique_ptr&lt;H26xByteToUnitStreamConverter&gt;(</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                       new H264ByteToUnitStreamConverter()),</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                   pid,</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                   emit_sample_cb),</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 94a4f0941a..881a0b8d29 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a5f25ce224..ced849ae4a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4c7e023eeb..cb56d5b1fa 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 5e73f45824..59e613d185 100644
--- a/docs/d6/d2e/mpd__notifier__util_8cc_source.html
+++ b/docs/d6/d2e/mpd__notifier__util_8cc_source.html
@@ -97,8 +97,8 @@ 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/strings/string_number_conversions.h&quot;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_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/file/file_closer.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/media/file/file_closer.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>
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; file(File::Open(output_path.c_str(), <span class="stringliteral">&quot;w&quot;</span>));</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; file(File::Open(output_path.c_str(), <span class="stringliteral">&quot;w&quot;</span>));</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keywordflow">if</span> (!file) {</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failed to open file for writing: &quot;</span> &lt;&lt; output_path;</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1010211bdb..9bfd156f05 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9f6b7de427..74a5fb6d4a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e03804b4a2..f12d7d2eb1 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 be6c931a77..5a34149e5d 100644
--- a/docs/d6/d41/encrypting__fragmenter_8cc_source.html
+++ b/docs/d6/d41/encrypting__fragmenter_8cc_source.html
@@ -147,355 +147,359 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">// namespace</span></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="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">   61</a></span>&#160;<a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter::EncryptingFragmenter</a>(</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    scoped_refptr&lt;StreamInfo&gt; info, <a class="code" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a>* traf,</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    scoped_ptr&lt;EncryptionKey&gt; encryption_key, int64_t clear_time,</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* listener)</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    : <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>(info, traf),</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;      info_(info),</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;      encryption_key_(encryption_key.Pass()),</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      nalu_length_size_(GetNaluLengthSize(*info)),</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;      video_codec_(GetCodec(*info)),</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;      clear_time_(clear_time),</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;      protection_scheme_(protection_scheme),</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;      crypt_byte_block_(crypt_byte_block),</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      skip_byte_block_(skip_byte_block),</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;      listener_(listener) {</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  DCHECK(encryption_key_);</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">switch</span> (video_codec_) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">case</span> kCodecVP8:</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;      vpx_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d8/d14/classshaka_1_1media_1_1VP8Parser.html">VP8Parser</a>);</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keywordflow">case</span> kCodecVP9:</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;      vpx_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../db/d5a/classshaka_1_1media_1_1VP9Parser.html">VP9Parser</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> kCodecH264:</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;      header_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html">H264VideoSliceHeaderParser</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> kCodecHVC1:</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      FALLTHROUGH_INTENDED;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordflow">case</span> kCodecHEV1:</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      header_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html">H265VideoSliceHeaderParser</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">default</span>:</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;      <span class="keywordflow">if</span> (nalu_length_size_ &gt; 0) {</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Unknown video codec &#39;&quot;</span> &lt;&lt; video_codec_</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;                     &lt;&lt; <span class="stringliteral">&quot;&#39;, whole subsamples will be encrypted.&quot;</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;}</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;EncryptingFragmenter::~EncryptingFragmenter() {}</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="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">  102</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">EncryptingFragmenter::AddSample</a>(scoped_refptr&lt;MediaSample&gt; sample) {</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  DCHECK(sample);</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordflow">if</span> (!fragment_initialized()) {</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">InitializeFragment</a>(sample-&gt;dts());</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;      <span class="keywordflow">return</span> status;</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> (encryptor_) {</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = EncryptSample(sample);</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      <span class="keywordflow">return</span> status;</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">return</span> <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">Fragmenter::AddSample</a>(sample);</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">  117</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">EncryptingFragmenter::InitializeFragment</a>(int64_t first_sample_dts) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a">Fragmenter::InitializeFragment</a>(first_sample_dts);</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;    <span class="keywordflow">return</span> 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;  <span class="keywordflow">if</span> (header_parser_ &amp;&amp; !header_parser_-&gt;Initialize(info_-&gt;codec_config()))</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Fail to read SPS and PPS data.&quot;</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;  traf()-&gt;auxiliary_size.sample_info_sizes.clear();</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  traf()-&gt;auxiliary_offset.offsets.clear();</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <span class="keywordflow">if</span> (IsSubsampleEncryptionRequired()) {</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;    traf()-&gt;sample_encryption.flags |=</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;        SampleEncryption::kUseSubsampleEncryption;</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;  traf()-&gt;sample_encryption.sample_encryption_entries.clear();</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="keyword">const</span> <span class="keywordtype">bool</span> enable_encryption = clear_time_ &lt;= 0;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  <span class="keywordflow">if</span> (!enable_encryption) {</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    <span class="comment">// This fragment should be in clear text.</span></div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="comment">// At most two sample description entries, an encrypted entry and a clear</span></div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    <span class="comment">// entry, are generated. The 1-based clear entry index is always 2.</span></div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;    <span class="keyword">const</span> uint32_t kClearSampleDescriptionIndex = 2;</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;    traf()-&gt;header.flags |=</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        TrackFragmentHeader::kSampleDescriptionIndexPresentMask;</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    traf()-&gt;header.sample_description_index = kClearSampleDescriptionIndex;</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    <span class="keywordflow">if</span> (listener_)</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;      listener_-&gt;<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a897463091f0effa647a8e2822f48b2ee">OnEncryptionStart</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="keywordflow">return</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">PrepareFragmentForEncryption</a>(enable_encryption);</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">  150</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">EncryptingFragmenter::FinalizeFragment</a>() {</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="keywordflow">if</span> (encryptor_) {</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;    DCHECK_LE(clear_time_, 0);</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;    <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">FinalizeFragmentForEncryption</a>();</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    DCHECK_GT(clear_time_, 0);</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    clear_time_ -= fragment_duration();</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;  <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a0295126af5e6b278a980021f43ae17ea">Fragmenter::FinalizeFragment</a>();</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="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">  161</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">EncryptingFragmenter::PrepareFragmentForEncryption</a>(</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    <span class="keywordtype">bool</span> enable_encryption) {</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keywordflow">return</span> (!enable_encryption || encryptor_) ? Status::OK : <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">CreateEncryptor</a>();</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">  166</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">EncryptingFragmenter::FinalizeFragmentForEncryption</a>() {</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="comment">// The offset will be adjusted in Segmenter after knowing moof size.</span></div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  traf()-&gt;auxiliary_offset.offsets.push_back(0);</div>
+<div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">   61</a></span>&#160;<a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter::EncryptingFragmenter</a>(</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    scoped_refptr&lt;StreamInfo&gt; info,</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <a class="code" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a>* traf,</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key,</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    int64_t clear_time,</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    FourCC protection_scheme,</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    uint8_t crypt_byte_block,</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    uint8_t skip_byte_block,</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* listener)</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    : <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">Fragmenter</a>(info, traf),</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;      info_(info),</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;      encryption_key_(std::move(encryption_key)),</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;      nalu_length_size_(GetNaluLengthSize(*info)),</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      video_codec_(GetCodec(*info)),</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;      clear_time_(clear_time),</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;      protection_scheme_(protection_scheme),</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;      crypt_byte_block_(crypt_byte_block),</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;      skip_byte_block_(skip_byte_block),</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;      listener_(listener) {</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  DCHECK(encryption_key_);</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">switch</span> (video_codec_) {</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordflow">case</span> kCodecVP8:</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;      vpx_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d8/d14/classshaka_1_1media_1_1VP8Parser.html">VP8Parser</a>);</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;    <span class="keywordflow">case</span> kCodecVP9:</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;      vpx_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../db/d5a/classshaka_1_1media_1_1VP9Parser.html">VP9Parser</a>);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    <span class="keywordflow">case</span> kCodecH264:</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      header_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html">H264VideoSliceHeaderParser</a>);</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="keywordflow">case</span> kCodecHVC1:</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;      FALLTHROUGH_INTENDED;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keywordflow">case</span> kCodecHEV1:</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;      header_parser_.reset(<span class="keyword">new</span> <a class="code" href="../../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html">H265VideoSliceHeaderParser</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;      <span class="keywordflow">if</span> (nalu_length_size_ &gt; 0) {</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Unknown video codec &#39;&quot;</span> &lt;&lt; video_codec_</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;                     &lt;&lt; <span class="stringliteral">&quot;&#39;, whole subsamples will be encrypted.&quot;</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">  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;EncryptingFragmenter::~EncryptingFragmenter() {}</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">  106</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">EncryptingFragmenter::AddSample</a>(scoped_refptr&lt;MediaSample&gt; sample) {</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  DCHECK(sample);</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordflow">if</span> (!fragment_initialized()) {</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">InitializeFragment</a>(sample-&gt;dts());</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;      <span class="keywordflow">return</span> status;</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">if</span> (encryptor_) {</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = EncryptSample(sample);</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;      <span class="keywordflow">return</span> status;</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">return</span> <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">Fragmenter::AddSample</a>(sample);</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">  121</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">EncryptingFragmenter::InitializeFragment</a>(int64_t first_sample_dts) {</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = <a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a">Fragmenter::InitializeFragment</a>(first_sample_dts);</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;    <span class="keywordflow">return</span> status;</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="keywordflow">if</span> (header_parser_ &amp;&amp; !header_parser_-&gt;Initialize(info_-&gt;codec_config()))</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Fail to read SPS and PPS data.&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;  traf()-&gt;auxiliary_size.sample_info_sizes.clear();</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  traf()-&gt;auxiliary_offset.offsets.clear();</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordflow">if</span> (IsSubsampleEncryptionRequired()) {</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    traf()-&gt;sample_encryption.flags |=</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;        SampleEncryption::kUseSubsampleEncryption;</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;  traf()-&gt;sample_encryption.sample_encryption_entries.clear();</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="keyword">const</span> <span class="keywordtype">bool</span> enable_encryption = clear_time_ &lt;= 0;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordflow">if</span> (!enable_encryption) {</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;    <span class="comment">// This fragment should be in clear text.</span></div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;    <span class="comment">// At most two sample description entries, an encrypted entry and a clear</span></div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    <span class="comment">// entry, are generated. The 1-based clear entry index is always 2.</span></div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    <span class="keyword">const</span> uint32_t kClearSampleDescriptionIndex = 2;</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;    traf()-&gt;header.flags |=</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;        TrackFragmentHeader::kSampleDescriptionIndexPresentMask;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    traf()-&gt;header.sample_description_index = kClearSampleDescriptionIndex;</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">if</span> (listener_)</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;      listener_-&gt;<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a897463091f0effa647a8e2822f48b2ee">OnEncryptionStart</a>();</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">return</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">PrepareFragmentForEncryption</a>(enable_encryption);</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"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">  154</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">EncryptingFragmenter::FinalizeFragment</a>() {</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordflow">if</span> (encryptor_) {</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    DCHECK_LE(clear_time_, 0);</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">FinalizeFragmentForEncryption</a>();</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;    DCHECK_GT(clear_time_, 0);</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;    clear_time_ -= fragment_duration();</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="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a0295126af5e6b278a980021f43ae17ea">Fragmenter::FinalizeFragment</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="l00165"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">  165</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">EncryptingFragmenter::PrepareFragmentForEncryption</a>(</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;    <span class="keywordtype">bool</span> enable_encryption) {</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordflow">return</span> (!enable_encryption || encryptor_) ? Status::OK : <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">CreateEncryptor</a>();</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="comment">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="keyword">const</span> uint8_t per_sample_iv_size =</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    (protection_scheme_ == FOURCC_cbcs) ? 0 :</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    static_cast&lt;uint8_t&gt;(encryptor_-&gt;iv().size());</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  traf()-&gt;sample_encryption.iv_size = per_sample_iv_size;</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">// Optimize saiz box.</span></div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  <a class="code" href="../../dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html">SampleAuxiliaryInformationSize</a>&amp; saiz = traf()-&gt;auxiliary_size;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  saiz.sample_count = traf()-&gt;runs[0].sample_sizes.size();</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="keywordflow">if</span> (!saiz.sample_info_sizes.empty()) {</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a208b7b8dd83e73c4206469695a3216d4">OptimizeSampleEntries</a>(&amp;saiz.sample_info_sizes,</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;                               &amp;saiz.default_sample_info_size)) {</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;      saiz.default_sample_info_size = 0;</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">else</span> {</div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;    <span class="comment">// |sample_info_sizes| table is filled in only for subsample encryption,</span></div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;    <span class="comment">// otherwise |sample_info_size| is just the IV size.</span></div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    DCHECK(!IsSubsampleEncryptionRequired());</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;    saiz.default_sample_info_size = <span class="keyword">static_cast&lt;</span>uint8_t<span class="keyword">&gt;</span>(per_sample_iv_size);</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="comment">// It should only happen with full sample encryption + constant iv, i.e.</span></div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="comment">// &#39;cbcs&#39; applying to audio.</span></div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordflow">if</span> (saiz.default_sample_info_size == 0 &amp;&amp; saiz.sample_info_sizes.empty()) {</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;    DCHECK_EQ(protection_scheme_, FOURCC_cbcs);</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;    DCHECK(!IsSubsampleEncryptionRequired());</div>
-<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;    <span class="comment">// ISO/IEC 23001-7:2016(E) The sample auxiliary information would then be</span></div>
-<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;    <span class="comment">// empty and should be emitted. Clear saiz and saio boxes so they are not</span></div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    <span class="comment">// written.</span></div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    saiz.sample_count = 0;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    traf()-&gt;auxiliary_offset.offsets.clear();</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;</div>
-<div class="line"><a name="l00204"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">  204</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">EncryptingFragmenter::CreateEncryptor</a>() {</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;  DCHECK(encryption_key_);</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  scoped_ptr&lt;AesCryptor&gt; encryptor;</div>
-<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordflow">switch</span> (protection_scheme_) {</div>
-<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    <span class="keywordflow">case</span> FOURCC_cenc:</div>
-<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>);</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    <span class="keywordflow">case</span> FOURCC_cbc1:</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(kNoPadding));</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keywordflow">case</span> FOURCC_cens:</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>(</div>
-<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;          crypt_byte_block(), skip_byte_block(),</div>
-<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;          <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;          AesCryptor::kDontUseConstantIv,</div>
-<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;          scoped_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>())));</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;    <span class="keywordflow">case</span> FOURCC_cbcs:</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>(</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;          crypt_byte_block(), skip_byte_block(),</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;          <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
-<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;          AesCryptor::kUseConstantIv,</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;          scoped_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(kNoPadding))));</div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="keywordflow">default</span>:</div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Unsupported protection scheme.&quot;</span>);</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">  232</span>&#160;  DCHECK(!encryption_key_-&gt;iv.empty());</div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> initialized =</div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;      encryptor-&gt;InitializeWithIv(encryption_key_-&gt;key, encryption_key_-&gt;iv);</div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">if</span> (!initialized)</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::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to create the encryptor.&quot;</span>);</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  encryptor_ = encryptor.Pass();</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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="keywordtype">void</span> EncryptingFragmenter::EncryptBytes(uint8_t* data, uint32_t size) {</div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  DCHECK(encryptor_);</div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;  CHECK(encryptor_-&gt;Crypt(data, size, data));</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;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> EncryptingFragmenter::EncryptSample(scoped_refptr&lt;MediaSample&gt; sample) {</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  DCHECK(encryptor_);</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;  SampleEncryptionEntry sample_encryption_entry;</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;  <span class="comment">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  <span class="keywordflow">if</span> (protection_scheme_ != FOURCC_cbcs)</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;    sample_encryption_entry.initialization_vector = encryptor_-&gt;iv();</div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  uint8_t* data = sample-&gt;writable_data();</div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  <span class="keywordflow">if</span> (IsSubsampleEncryptionRequired()) {</div>
-<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;    <span class="keywordflow">if</span> (vpx_parser_) {</div>
-<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;      std::vector&lt;VPxFrameInfo&gt; vpx_frames;</div>
-<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;      <span class="keywordflow">if</span> (!vpx_parser_-&gt;Parse(sample-&gt;data(), sample-&gt;data_size(),</div>
-<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;                              &amp;vpx_frames)) {</div>
-<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;        <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to parse vpx frame.&quot;</span>);</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;</div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;      <span class="keyword">const</span> <span class="keywordtype">bool</span> is_superframe = vpx_frames.size() &gt; 1;</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;      <span class="keywordflow">for</span> (<span class="keyword">const</span> VPxFrameInfo&amp; frame : vpx_frames) {</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;        SubsampleEntry subsample;</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;        subsample.clear_bytes =</div>
-<div class="line"><a name="l00266"></a><span class="lineno">  266</span>&#160;            <span class="keyword">static_cast&lt;</span>uint16_t<span class="keyword">&gt;</span>(frame.uncompressed_header_size);</div>
-<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;        subsample.cipher_bytes =</div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;            frame.frame_size - frame.uncompressed_header_size;</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">// &quot;VP Codec ISO Media File Format Binding&quot; document requires that the</span></div>
-<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;        <span class="comment">// encrypted bytes of each frame within the superframe must be block</span></div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;        <span class="comment">// aligned so that the counter state can be computed for each frame</span></div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;        <span class="comment">// within the superframe.</span></div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;        <span class="comment">// ISO/IEC 23001-7:2016 10.2 &#39;cbc1&#39; 10.3 &#39;cens&#39;</span></div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;        <span class="comment">// The BytesOfProtectedData size SHALL be a multiple of 16 bytes to</span></div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;        <span class="comment">// avoid partial blocks in Subsamples.</span></div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;        <span class="keywordflow">if</span> (is_superframe || protection_scheme_ == FOURCC_cbc1 ||</div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;            protection_scheme_ == FOURCC_cens) {</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;          <span class="keyword">const</span> uint16_t misalign_bytes =</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;              subsample.cipher_bytes % kCencBlockSize;</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;          subsample.clear_bytes += misalign_bytes;</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;          subsample.cipher_bytes -= misalign_bytes;</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;        sample_encryption_entry.subsamples.push_back(subsample);</div>
-<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;        <span class="keywordflow">if</span> (subsample.cipher_bytes &gt; 0)</div>
-<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;          EncryptBytes(data + subsample.clear_bytes, subsample.cipher_bytes);</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;        data += frame.frame_size;</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="comment">// Add subsample for the superframe index if exists.</span></div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;      <span class="keywordflow">if</span> (is_superframe) {</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;        <span class="keywordtype">size_t</span> index_size = sample-&gt;data() + sample-&gt;data_size() - data;</div>
-<div class="line"><a name="l00293"></a><span class="lineno">  293</span>&#160;        DCHECK_LE(index_size, 2 + vpx_frames.size() * 4);</div>
-<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;        DCHECK_GE(index_size, 2 + vpx_frames.size() * 1);</div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;        SubsampleEntry subsample;</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;        subsample.clear_bytes = <span class="keyword">static_cast&lt;</span>uint16_t<span class="keyword">&gt;</span>(index_size);</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        subsample.cipher_bytes = 0;</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;        sample_encryption_entry.subsamples.push_back(subsample);</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">else</span> {</div>
-<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;      <span class="keyword">const</span> Nalu::CodecType nalu_type =</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;          (video_codec_ == kCodecHVC1 || video_codec_ == kCodecHEV1)</div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;              ? Nalu::kH265</div>
-<div class="line"><a name="l00304"></a><span class="lineno">  304</span>&#160;              : Nalu::kH264;</div>
-<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;      NaluReader reader(nalu_type, nalu_length_size_, data,</div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;                        sample-&gt;data_size());</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="comment">// Store the current length of clear data.  This is used to squash</span></div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;      <span class="comment">// multiple unencrypted NAL units into fewer subsample entries.</span></div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;      uint64_t accumulated_clear_bytes = 0;</div>
+<div class="line"><a name="l00170"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">  170</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">EncryptingFragmenter::FinalizeFragmentForEncryption</a>() {</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="comment">// The offset will be adjusted in Segmenter after knowing moof size.</span></div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  traf()-&gt;auxiliary_offset.offsets.push_back(0);</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">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="keyword">const</span> uint8_t per_sample_iv_size =</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;    (protection_scheme_ == FOURCC_cbcs) ? 0 :</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;    static_cast&lt;uint8_t&gt;(encryptor_-&gt;iv().size());</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  traf()-&gt;sample_encryption.iv_size = per_sample_iv_size;</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="comment">// Optimize saiz box.</span></div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  <a class="code" href="../../dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html">SampleAuxiliaryInformationSize</a>&amp; saiz = traf()-&gt;auxiliary_size;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  saiz.sample_count = traf()-&gt;runs[0].sample_sizes.size();</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  <span class="keywordflow">if</span> (!saiz.sample_info_sizes.empty()) {</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;    <span class="keywordflow">if</span> (!<a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a208b7b8dd83e73c4206469695a3216d4">OptimizeSampleEntries</a>(&amp;saiz.sample_info_sizes,</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;                               &amp;saiz.default_sample_info_size)) {</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;      saiz.default_sample_info_size = 0;</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="keywordflow">else</span> {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;    <span class="comment">// |sample_info_sizes| table is filled in only for subsample encryption,</span></div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    <span class="comment">// otherwise |sample_info_size| is just the IV size.</span></div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;    DCHECK(!IsSubsampleEncryptionRequired());</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    saiz.default_sample_info_size = <span class="keyword">static_cast&lt;</span>uint8_t<span class="keyword">&gt;</span>(per_sample_iv_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;</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  <span class="comment">// It should only happen with full sample encryption + constant iv, i.e.</span></div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;  <span class="comment">// &#39;cbcs&#39; applying to audio.</span></div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordflow">if</span> (saiz.default_sample_info_size == 0 &amp;&amp; saiz.sample_info_sizes.empty()) {</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;    DCHECK_EQ(protection_scheme_, FOURCC_cbcs);</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;    DCHECK(!IsSubsampleEncryptionRequired());</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="comment">// ISO/IEC 23001-7:2016(E) The sample auxiliary information would then be</span></div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    <span class="comment">// empty and should be emitted. Clear saiz and saio boxes so they are not</span></div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;    <span class="comment">// written.</span></div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;    saiz.sample_count = 0;</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;    traf()-&gt;auxiliary_offset.offsets.clear();</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;</div>
+<div class="line"><a name="l00208"></a><span class="lineno"><a class="line" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">  208</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">EncryptingFragmenter::CreateEncryptor</a>() {</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  DCHECK(encryption_key_);</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  std::unique_ptr&lt;AesCryptor&gt; encryptor;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keywordflow">switch</span> (protection_scheme_) {</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    <span class="keywordflow">case</span> FOURCC_cenc:</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>);</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    <span class="keywordflow">case</span> FOURCC_cbc1:</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(kNoPadding));</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;    <span class="keywordflow">case</span> FOURCC_cens:</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>(</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;          crypt_byte_block(), skip_byte_block(),</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;          <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;          AesCryptor::kDontUseConstantIv,</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;          std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> <a class="code" href="../../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html">AesCtrEncryptor</a>())));</div>
+<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00225"></a><span class="lineno">  225</span>&#160;    <span class="keywordflow">case</span> FOURCC_cbcs:</div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;      encryptor.reset(<span class="keyword">new</span> <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">AesPatternCryptor</a>(</div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;          crypt_byte_block(), skip_byte_block(),</div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;          <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0a76b19d202e22b2b0f661f933b47b3b16">AesPatternCryptor::kEncryptIfCryptByteBlockRemaining</a>,</div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;          AesCryptor::kUseConstantIv,</div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;          std::unique_ptr&lt;AesCryptor&gt;(<span class="keyword">new</span> <a class="code" href="../../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html">AesCbcEncryptor</a>(kNoPadding))));</div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="keywordflow">default</span>:</div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Unsupported protection scheme.&quot;</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;  DCHECK(!encryption_key_-&gt;iv.empty());</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> initialized =</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;      encryptor-&gt;InitializeWithIv(encryption_key_-&gt;key, encryption_key_-&gt;iv);</div>
+<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  <span class="keywordflow">if</span> (!initialized)</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;    <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to create the encryptor.&quot;</span>);</div>
+<div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;  encryptor_ = std::move(encryptor);</div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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">void</span> EncryptingFragmenter::EncryptBytes(uint8_t* data, uint32_t size) {</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;  DCHECK(encryptor_);</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;  CHECK(encryptor_-&gt;Crypt(data, size, data));</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;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> EncryptingFragmenter::EncryptSample(scoped_refptr&lt;MediaSample&gt; sample) {</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;  DCHECK(encryptor_);</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;  SampleEncryptionEntry sample_encryption_entry;</div>
+<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;  <span class="comment">// For &#39;cbcs&#39; scheme, Constant IVs SHALL be used.</span></div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  <span class="keywordflow">if</span> (protection_scheme_ != FOURCC_cbcs)</div>
+<div class="line"><a name="l00256"></a><span class="lineno">  256</span>&#160;    sample_encryption_entry.initialization_vector = encryptor_-&gt;iv();</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;  uint8_t* data = sample-&gt;writable_data();</div>
+<div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;  <span class="keywordflow">if</span> (IsSubsampleEncryptionRequired()) {</div>
+<div class="line"><a name="l00259"></a><span class="lineno">  259</span>&#160;    <span class="keywordflow">if</span> (vpx_parser_) {</div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;      std::vector&lt;VPxFrameInfo&gt; vpx_frames;</div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;      <span class="keywordflow">if</span> (!vpx_parser_-&gt;Parse(sample-&gt;data(), sample-&gt;data_size(),</div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;                              &amp;vpx_frames)) {</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;        <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to parse vpx frame.&quot;</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="keyword">const</span> <span class="keywordtype">bool</span> is_superframe = vpx_frames.size() &gt; 1;</div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;      <span class="keywordflow">for</span> (<span class="keyword">const</span> VPxFrameInfo&amp; frame : vpx_frames) {</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;        SubsampleEntry subsample;</div>
+<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;        subsample.clear_bytes =</div>
+<div class="line"><a name="l00270"></a><span class="lineno">  270</span>&#160;            <span class="keyword">static_cast&lt;</span>uint16_t<span class="keyword">&gt;</span>(frame.uncompressed_header_size);</div>
+<div class="line"><a name="l00271"></a><span class="lineno">  271</span>&#160;        subsample.cipher_bytes =</div>
+<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160;            frame.frame_size - frame.uncompressed_header_size;</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">// &quot;VP Codec ISO Media File Format Binding&quot; document requires that the</span></div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;        <span class="comment">// encrypted bytes of each frame within the superframe must be block</span></div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;        <span class="comment">// aligned so that the counter state can be computed for each frame</span></div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;        <span class="comment">// within the superframe.</span></div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;        <span class="comment">// ISO/IEC 23001-7:2016 10.2 &#39;cbc1&#39; 10.3 &#39;cens&#39;</span></div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;        <span class="comment">// The BytesOfProtectedData size SHALL be a multiple of 16 bytes to</span></div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;        <span class="comment">// avoid partial blocks in Subsamples.</span></div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;        <span class="keywordflow">if</span> (is_superframe || protection_scheme_ == FOURCC_cbc1 ||</div>
+<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;            protection_scheme_ == FOURCC_cens) {</div>
+<div class="line"><a name="l00283"></a><span class="lineno">  283</span>&#160;          <span class="keyword">const</span> uint16_t misalign_bytes =</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;              subsample.cipher_bytes % kCencBlockSize;</div>
+<div class="line"><a name="l00285"></a><span class="lineno">  285</span>&#160;          subsample.clear_bytes += misalign_bytes;</div>
+<div class="line"><a name="l00286"></a><span class="lineno">  286</span>&#160;          subsample.cipher_bytes -= misalign_bytes;</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;        sample_encryption_entry.subsamples.push_back(subsample);</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;        <span class="keywordflow">if</span> (subsample.cipher_bytes &gt; 0)</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;          EncryptBytes(data + subsample.clear_bytes, subsample.cipher_bytes);</div>
+<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;        data += frame.frame_size;</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="comment">// Add subsample for the superframe index if exists.</span></div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;      <span class="keywordflow">if</span> (is_superframe) {</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;        <span class="keywordtype">size_t</span> index_size = sample-&gt;data() + sample-&gt;data_size() - data;</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;        DCHECK_LE(index_size, 2 + vpx_frames.size() * 4);</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;        DCHECK_GE(index_size, 2 + vpx_frames.size() * 1);</div>
+<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;        SubsampleEntry subsample;</div>
+<div class="line"><a name="l00300"></a><span class="lineno">  300</span>&#160;        subsample.clear_bytes = <span class="keyword">static_cast&lt;</span>uint16_t<span class="keyword">&gt;</span>(index_size);</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;        subsample.cipher_bytes = 0;</div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;        sample_encryption_entry.subsamples.push_back(subsample);</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="keywordflow">else</span> {</div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;      <span class="keyword">const</span> Nalu::CodecType nalu_type =</div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;          (video_codec_ == kCodecHVC1 || video_codec_ == kCodecHEV1)</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;              ? Nalu::kH265</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;              : Nalu::kH264;</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;      NaluReader reader(nalu_type, nalu_length_size_, data,</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;                        sample-&gt;data_size());</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;      Nalu nalu;</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;      NaluReader::Result result;</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      <span class="keywordflow">while</span> ((result = reader.Advance(&amp;nalu)) == NaluReader::kOk) {</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;        <span class="keywordflow">if</span> (nalu.is_video_slice()) {</div>
-<div class="line"><a name="l00316"></a><span class="lineno">  316</span>&#160;          <span class="comment">// For video-slice NAL units, encrypt the video slice.  This skips</span></div>
-<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;          <span class="comment">// the frame header.  If this is an unrecognized codec (e.g. H.265),</span></div>
-<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;          <span class="comment">// the whole NAL unit will be encrypted.</span></div>
-<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;          <span class="keyword">const</span> int64_t video_slice_header_size =</div>
-<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;              header_parser_ ? header_parser_-&gt;GetHeaderSize(nalu) : 0;</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;          <span class="keywordflow">if</span> (video_slice_header_size &lt; 0)</div>
-<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;            <span class="keywordflow">return</span> Status(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to read slice header.&quot;</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;          uint64_t current_clear_bytes =</div>
-<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;              nalu.header_size() + video_slice_header_size;</div>
-<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;          uint64_t cipher_bytes = nalu.payload_size() - video_slice_header_size;</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;      <span class="comment">// Store the current length of clear data.  This is used to squash</span></div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;      <span class="comment">// multiple unencrypted NAL units into fewer subsample entries.</span></div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;      uint64_t accumulated_clear_bytes = 0;</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;      Nalu nalu;</div>
+<div class="line"><a name="l00317"></a><span class="lineno">  317</span>&#160;      NaluReader::Result result;</div>
+<div class="line"><a name="l00318"></a><span class="lineno">  318</span>&#160;      <span class="keywordflow">while</span> ((result = reader.Advance(&amp;nalu)) == NaluReader::kOk) {</div>
+<div class="line"><a name="l00319"></a><span class="lineno">  319</span>&#160;        <span class="keywordflow">if</span> (nalu.is_video_slice()) {</div>
+<div class="line"><a name="l00320"></a><span class="lineno">  320</span>&#160;          <span class="comment">// For video-slice NAL units, encrypt the video slice.  This skips</span></div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;          <span class="comment">// the frame header.  If this is an unrecognized codec (e.g. H.265),</span></div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;          <span class="comment">// the whole NAL unit will be encrypted.</span></div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;          <span class="keyword">const</span> int64_t video_slice_header_size =</div>
+<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;              header_parser_ ? header_parser_-&gt;GetHeaderSize(nalu) : 0;</div>
+<div class="line"><a name="l00325"></a><span class="lineno">  325</span>&#160;          <span class="keywordflow">if</span> (video_slice_header_size &lt; 0)</div>
+<div class="line"><a name="l00326"></a><span class="lineno">  326</span>&#160;            <span class="keywordflow">return</span> Status(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to read slice header.&quot;</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;          <span class="comment">// ISO/IEC 23001-7:2016 10.2 &#39;cbc1&#39; 10.3 &#39;cens&#39;</span></div>
-<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;          <span class="comment">// The BytesOfProtectedData size SHALL be a multiple of 16 bytes to</span></div>
-<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;          <span class="comment">// avoid partial blocks in Subsamples.</span></div>
-<div class="line"><a name="l00331"></a><span class="lineno">  331</span>&#160;          <span class="keywordflow">if</span> (protection_scheme_ == FOURCC_cbc1 ||</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160;              protection_scheme_ == FOURCC_cens) {</div>
-<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;            <span class="keyword">const</span> uint16_t misalign_bytes = cipher_bytes % kCencBlockSize;</div>
-<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;            current_clear_bytes += misalign_bytes;</div>
-<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;            cipher_bytes -= misalign_bytes;</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="keyword">const</span> uint8_t* nalu_data = nalu.data() + current_clear_bytes;</div>
-<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;          EncryptBytes(const_cast&lt;uint8_t*&gt;(nalu_data), cipher_bytes);</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;          AddSubsamples(</div>
-<div class="line"><a name="l00342"></a><span class="lineno">  342</span>&#160;              accumulated_clear_bytes + nalu_length_size_ + current_clear_bytes,</div>
-<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;              cipher_bytes, &amp;sample_encryption_entry.subsamples);</div>
-<div class="line"><a name="l00344"></a><span class="lineno">  344</span>&#160;          accumulated_clear_bytes = 0;</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160;        } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;          <span class="comment">// For non-video-slice NAL units, don&#39;t encrypt.</span></div>
-<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;          accumulated_clear_bytes +=</div>
-<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;              nalu_length_size_ + nalu.header_size() + nalu.payload_size();</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;      }</div>
-<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;      <span class="keywordflow">if</span> (result != NaluReader::kEOStream)</div>
-<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;        <span class="keywordflow">return</span> Status(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to parse NAL units.&quot;</span>);</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160;      AddSubsamples(accumulated_clear_bytes, 0,</div>
-<div class="line"><a name="l00354"></a><span class="lineno">  354</span>&#160;                    &amp;sample_encryption_entry.subsamples);</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;    DCHECK_EQ(sample_encryption_entry.GetTotalSizeOfSubsamples(),</div>
-<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;              sample-&gt;data_size());</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">// The length of per-sample auxiliary datum, defined in CENC ch. 7.</span></div>
-<div class="line"><a name="l00360"></a><span class="lineno">  360</span>&#160;    traf()-&gt;auxiliary_size.sample_info_sizes.push_back(</div>
-<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;        sample_encryption_entry.ComputeSize());</div>
-<div class="line"><a name="l00362"></a><span class="lineno">  362</span>&#160;  } <span class="keywordflow">else</span> {</div>
-<div class="line"><a name="l00363"></a><span class="lineno">  363</span>&#160;    DCHECK_LE(crypt_byte_block(), 1u);</div>
-<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;    DCHECK_EQ(skip_byte_block(), 0u);</div>
-<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;    EncryptBytes(data, sample-&gt;data_size());</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;  traf()-&gt;sample_encryption.sample_encryption_entries.push_back(</div>
-<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;      sample_encryption_entry);</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160;  encryptor_-&gt;UpdateIv();</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;<span class="keywordtype">bool</span> EncryptingFragmenter::IsSubsampleEncryptionRequired() {</div>
-<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  <span class="keywordflow">return</span> vpx_parser_ || nalu_length_size_ != 0;</div>
+<div class="line"><a name="l00328"></a><span class="lineno">  328</span>&#160;          uint64_t current_clear_bytes =</div>
+<div class="line"><a name="l00329"></a><span class="lineno">  329</span>&#160;              nalu.header_size() + video_slice_header_size;</div>
+<div class="line"><a name="l00330"></a><span class="lineno">  330</span>&#160;          uint64_t cipher_bytes = nalu.payload_size() - video_slice_header_size;</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;          <span class="comment">// ISO/IEC 23001-7:2016 10.2 &#39;cbc1&#39; 10.3 &#39;cens&#39;</span></div>
+<div class="line"><a name="l00333"></a><span class="lineno">  333</span>&#160;          <span class="comment">// The BytesOfProtectedData size SHALL be a multiple of 16 bytes to</span></div>
+<div class="line"><a name="l00334"></a><span class="lineno">  334</span>&#160;          <span class="comment">// avoid partial blocks in Subsamples.</span></div>
+<div class="line"><a name="l00335"></a><span class="lineno">  335</span>&#160;          <span class="keywordflow">if</span> (protection_scheme_ == FOURCC_cbc1 ||</div>
+<div class="line"><a name="l00336"></a><span class="lineno">  336</span>&#160;              protection_scheme_ == FOURCC_cens) {</div>
+<div class="line"><a name="l00337"></a><span class="lineno">  337</span>&#160;            <span class="keyword">const</span> uint16_t misalign_bytes = cipher_bytes % kCencBlockSize;</div>
+<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160;            current_clear_bytes += misalign_bytes;</div>
+<div class="line"><a name="l00339"></a><span class="lineno">  339</span>&#160;            cipher_bytes -= misalign_bytes;</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="keyword">const</span> uint8_t* nalu_data = nalu.data() + current_clear_bytes;</div>
+<div class="line"><a name="l00343"></a><span class="lineno">  343</span>&#160;          EncryptBytes(const_cast&lt;uint8_t*&gt;(nalu_data), cipher_bytes);</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;          AddSubsamples(</div>
+<div class="line"><a name="l00346"></a><span class="lineno">  346</span>&#160;              accumulated_clear_bytes + nalu_length_size_ + current_clear_bytes,</div>
+<div class="line"><a name="l00347"></a><span class="lineno">  347</span>&#160;              cipher_bytes, &amp;sample_encryption_entry.subsamples);</div>
+<div class="line"><a name="l00348"></a><span class="lineno">  348</span>&#160;          accumulated_clear_bytes = 0;</div>
+<div class="line"><a name="l00349"></a><span class="lineno">  349</span>&#160;        } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00350"></a><span class="lineno">  350</span>&#160;          <span class="comment">// For non-video-slice NAL units, don&#39;t encrypt.</span></div>
+<div class="line"><a name="l00351"></a><span class="lineno">  351</span>&#160;          accumulated_clear_bytes +=</div>
+<div class="line"><a name="l00352"></a><span class="lineno">  352</span>&#160;              nalu_length_size_ + nalu.header_size() + nalu.payload_size();</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;      <span class="keywordflow">if</span> (result != NaluReader::kEOStream)</div>
+<div class="line"><a name="l00356"></a><span class="lineno">  356</span>&#160;        <span class="keywordflow">return</span> Status(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to parse NAL units.&quot;</span>);</div>
+<div class="line"><a name="l00357"></a><span class="lineno">  357</span>&#160;      AddSubsamples(accumulated_clear_bytes, 0,</div>
+<div class="line"><a name="l00358"></a><span class="lineno">  358</span>&#160;                    &amp;sample_encryption_entry.subsamples);</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;    DCHECK_EQ(sample_encryption_entry.GetTotalSizeOfSubsamples(),</div>
+<div class="line"><a name="l00361"></a><span class="lineno">  361</span>&#160;              sample-&gt;data_size());</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;    <span class="comment">// The length of per-sample auxiliary datum, defined in CENC ch. 7.</span></div>
+<div class="line"><a name="l00364"></a><span class="lineno">  364</span>&#160;    traf()-&gt;auxiliary_size.sample_info_sizes.push_back(</div>
+<div class="line"><a name="l00365"></a><span class="lineno">  365</span>&#160;        sample_encryption_entry.ComputeSize());</div>
+<div class="line"><a name="l00366"></a><span class="lineno">  366</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00367"></a><span class="lineno">  367</span>&#160;    DCHECK_LE(crypt_byte_block(), 1u);</div>
+<div class="line"><a name="l00368"></a><span class="lineno">  368</span>&#160;    DCHECK_EQ(skip_byte_block(), 0u);</div>
+<div class="line"><a name="l00369"></a><span class="lineno">  369</span>&#160;    EncryptBytes(data, sample-&gt;data_size());</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;  traf()-&gt;sample_encryption.sample_encryption_entries.push_back(</div>
+<div class="line"><a name="l00373"></a><span class="lineno">  373</span>&#160;      sample_encryption_entry);</div>
+<div class="line"><a name="l00374"></a><span class="lineno">  374</span>&#160;  encryptor_-&gt;UpdateIv();</div>
+<div class="line"><a name="l00375"></a><span class="lineno">  375</span>&#160;  <span class="keywordflow">return</span> Status::OK;</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 mp4</span></div>
-<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00380"></a><span class="lineno">  380</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00378"></a><span class="lineno">  378</span>&#160;<span class="keywordtype">bool</span> EncryptingFragmenter::IsSubsampleEncryptionRequired() {</div>
+<div class="line"><a name="l00379"></a><span class="lineno">  379</span>&#160;  <span class="keywordflow">return</span> vpx_parser_ || nalu_length_size_ != 0;</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;</div>
+<div class="line"><a name="l00382"></a><span class="lineno">  382</span>&#160;}  <span class="comment">// namespace mp4</span></div>
+<div class="line"><a name="l00383"></a><span class="lineno">  383</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00384"></a><span class="lineno">  384</span>&#160;}  <span class="comment">// namespace shaka</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_1mp4_1_1EncryptingFragmenter_html_afeb03755fa2e6a53376ae5ceb7440021"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">shaka::media::mp4::EncryptingFragmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00102">encrypting_fragmenter.cc:102</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a126294f104809268975fe04391902ad3"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter::InitializeFragment</a></div><div class="ttdeci">Status InitializeFragment(int64_t first_sample_dts) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00117">encrypting_fragmenter.cc:117</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a5a331edd7e75f6cd15ccbe9c688440a4"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">shaka::media::mp4::EncryptingFragmenter::EncryptingFragmenter</a></div><div class="ttdeci">EncryptingFragmenter(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, scoped_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00061">encrypting_fragmenter.cc:61</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_afeb03755fa2e6a53376ae5ceb7440021"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">shaka::media::mp4::EncryptingFragmenter::AddSample</a></div><div class="ttdeci">Status AddSample(scoped_refptr&lt; MediaSample &gt; sample) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00106">encrypting_fragmenter.cc:106</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a126294f104809268975fe04391902ad3"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter::InitializeFragment</a></div><div class="ttdeci">Status InitializeFragment(int64_t first_sample_dts) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00121">encrypting_fragmenter.cc:121</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1TrackFragment_html"><div class="ttname"><a href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">shaka::media::mp4::TrackFragment</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00728">box_definitions.h:728</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Fragmenter_html_a684c1f318ac05e85f4dbf373ea65b7ad"><div class="ttname"><a href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">shaka::media::mp4::Fragmenter::AddSample</a></div><div class="ttdeci">virtual Status AddSample(scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d9a/fragmenter_8cc_source.html#l00047">fragmenter.cc:47</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="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a0de01823838c543cb8f6f8e330712ac2"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">shaka::media::mp4::EncryptingFragmenter::FinalizeFragment</a></div><div class="ttdeci">void FinalizeFragment() override</div><div class="ttdoc">Finalize and optimize the fragment. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00150">encrypting_fragmenter.cc:150</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a0de01823838c543cb8f6f8e330712ac2"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">shaka::media::mp4::EncryptingFragmenter::FinalizeFragment</a></div><div class="ttdeci">void FinalizeFragment() override</div><div class="ttdoc">Finalize and optimize the fragment. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00154">encrypting_fragmenter.cc:154</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Fragmenter_html_aa702c2af5ea5096d94f2943076a21e4a"><div class="ttname"><a href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a">shaka::media::mp4::Fragmenter::InitializeFragment</a></div><div class="ttdeci">virtual Status InitializeFragment(int64_t first_sample_dts)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d9a/fragmenter_8cc_source.html#l00092">fragmenter.cc:92</a></div></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#l00025">aes_pattern_cryptor.h:25</a></div></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_1VP8Parser_html"><div class="ttname"><a href="../../d8/d14/classshaka_1_1media_1_1VP8Parser.html">shaka::media::VP8Parser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d65/vp8__parser_8h_source.html#l00021">vp8_parser.h:21</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1Fragmenter_html_a0295126af5e6b278a980021f43ae17ea"><div class="ttname"><a href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a0295126af5e6b278a980021f43ae17ea">shaka::media::mp4::Fragmenter::FinalizeFragment</a></div><div class="ttdeci">virtual void FinalizeFragment()</div><div class="ttdoc">Finalize and optimize the fragment. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d9a/fragmenter_8cc_source.html#l00111">fragmenter.cc:111</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#l00078">aes_encryptor.h:78</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a5cfbe43af4b1617853cef5fc2243003b"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">shaka::media::mp4::EncryptingFragmenter::FinalizeFragmentForEncryption</a></div><div class="ttdeci">virtual void FinalizeFragmentForEncryption()</div><div class="ttdoc">Finalize current fragment for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00166">encrypting_fragmenter.cc:166</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_1mp4_1_1EncryptingFragmenter_html_a5cfbe43af4b1617853cef5fc2243003b"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5cfbe43af4b1617853cef5fc2243003b">shaka::media::mp4::EncryptingFragmenter::FinalizeFragmentForEncryption</a></div><div class="ttdeci">virtual void FinalizeFragmentForEncryption()</div><div class="ttdoc">Finalize current fragment for encryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00170">encrypting_fragmenter.cc:170</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="classshaka_1_1media_1_1H264VideoSliceHeaderParser_html"><div class="ttname"><a href="../../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html">shaka::media::H264VideoSliceHeaderParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d33/video__slice__header__parser_8h_source.html#l00036">video_slice_header_parser.h:36</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_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00016">aes_pattern_cryptor.h:16</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#l00043">aes_encryptor.h:43</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></div><div class="ttdoc">Implements pattern-based encryption/decryption. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d09/aes__pattern__cryptor_8h_source.html#l00017">aes_pattern_cryptor.h:17</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_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="structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize_html"><div class="ttname"><a href="../../dd/d13/structshaka_1_1media_1_1mp4_1_1SampleAuxiliaryInformationSize.html">shaka::media::mp4::SampleAuxiliaryInformationSize</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00069">box_definitions.h:69</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00204">encrypting_fragmenter.cc:204</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_ace1882cf57dab24ee8e38765675e69a1"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">shaka::media::mp4::EncryptingFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">virtual Status PrepareFragmentForEncryption(bool enable_encryption)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00161">encrypting_fragmenter.cc:161</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00208">encrypting_fragmenter.cc:208</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_ace1882cf57dab24ee8e38765675e69a1"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">shaka::media::mp4::EncryptingFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">virtual Status PrepareFragmentForEncryption(bool enable_encryption)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00165">encrypting_fragmenter.cc:165</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a3c1c1037b7d9e6edf1f476434705c3d5"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">shaka::media::mp4::EncryptingFragmenter::EncryptingFragmenter</a></div><div class="ttdeci">EncryptingFragmenter(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, std::unique_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00061">encrypting_fragmenter.cc:61</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 class="ttc" id="classshaka_1_1media_1_1mp4_1_1Fragmenter_html_a208b7b8dd83e73c4206469695a3216d4"><div class="ttname"><a href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a208b7b8dd83e73c4206469695a3216d4">shaka::media::mp4::Fragmenter::OptimizeSampleEntries</a></div><div class="ttdeci">bool OptimizeSampleEntries(std::vector&lt; T &gt; *entries, T *default_value)</div><div class="ttdef"><b>Definition:</b> <a href="../../da/dd1/fragmenter_8h_source.html#l00102">fragmenter.h:102</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 307dbedc4e..34f86a32bf 100644
--- a/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html
+++ b/docs/d6/d4e/webm_2multi__segment__segmenter_8cc_source.html
@@ -120,8 +120,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> MultiSegmentSegmenter::DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) {</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  writer_ = writer.Pass();</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> MultiSegmentSegmenter::DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) {</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  writer_ = std::move(writer);</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordflow">return</span> WriteSegmentHeader(0, writer_.get());</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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 07aae6709c..39576d8c88 100644
--- a/docs/d6/d55/aes__cryptor_8cc_source.html
+++ b/docs/d6/d55/aes__cryptor_8cc_source.html
@@ -231,7 +231,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1d6ad28e4f..6b6c59223a 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 2a346b3a5f..a9333b6bee 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 4e2db5d083..99f7cf0754 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3cd66ae497..a4f94ee952 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ebb67670fa..0f7e43c8e8 100644
--- a/docs/d6/d6e/ts__section__pes_8cc_source.html
+++ b/docs/d6/d6e/ts__section__pes_8cc_source.html
@@ -171,13 +171,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;<span class="keyword">namespace </span>media {</div>
 <div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="keyword">namespace </span>mp2t {</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;TsSectionPes::TsSectionPes(scoped_ptr&lt;EsParser&gt; es_parser)</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  : es_parser_(es_parser.release()),</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    wait_for_pusi_(true),</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    previous_pts_valid_(false),</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    previous_pts_(0),</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    previous_dts_valid_(false),</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    previous_dts_(0) {</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;TsSectionPes::TsSectionPes(std::unique_ptr&lt;EsParser&gt; es_parser)</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    : es_parser_(es_parser.release()),</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;      wait_for_pusi_(true),</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;      previous_pts_valid_(false),</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;      previous_pts_(0),</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;      previous_dts_valid_(false),</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;      previous_dts_(0) {</div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  DCHECK(es_parser_);</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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 09bdb8ae66..5818a226aa 100644
--- a/docs/d6/d71/scoped__xml__ptr_8h_source.html
+++ b/docs/d6/d71/scoped__xml__ptr_8h_source.html
@@ -93,7 +93,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">// license that can be found in the LICENSE file or at</span></div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// https://developers.google.com/open-source/licenses/bsd</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// scoped_ptr alias for libxml2 objects. Deleters for the objects are also</span></div>
+<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment">// unique_ptr alias for libxml2 objects. Deleters for the objects are also</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// defined in this file.</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="preprocessor">#ifndef MPD_BASE_XML_SCOPED_XML_PTR_H_</span></div>
@@ -102,13 +102,13 @@ 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 &lt;libxml/tree.h&gt;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;libxml/xmlschemas.h&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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</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>xml {</div>
 <div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
 <div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="../../dd/da4/structshaka_1_1xml_1_1XmlDeleter.html">   23</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../dd/da4/structshaka_1_1xml_1_1XmlDeleter.html">XmlDeleter</a> {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="comment">// Called by scoped_ptr. http://goo.gl/YaLbcS</span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="comment">// Called by std::unique_ptr.</span></div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  <span class="keyword">inline</span> <span class="keywordtype">void</span> operator()(xmlSchemaParserCtxtPtr ptr)<span class="keyword"> const </span>{</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    xmlSchemaFreeParserCtxt(ptr);</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  }</div>
@@ -122,16 +122,17 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="keyword">template</span> &lt;<span class="keyword">typename</span> XmlType&gt;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keyword">using</span> scoped_xml_ptr = scoped_ptr&lt;XmlType, XmlDeleter&gt;;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="keyword">using</span> scoped_xml_ptr = std::unique_ptr&lt;XmlType, XmlDeleter&gt;;</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 xml</span></div>
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_XML_SCOPED_XML_PTR_H_</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;<span class="preprocessor">#endif  // MPD_BASE_XML_SCOPED_XML_PTR_H_</span></div>
 <div class="ttc" id="structshaka_1_1xml_1_1XmlDeleter_html"><div class="ttname"><a href="../../dd/da4/structshaka_1_1xml_1_1XmlDeleter.html">shaka::xml::XmlDeleter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d71/scoped__xml__ptr_8h_source.html#l00023">scoped_xml_ptr.h:23</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 eb4ad5959e..e732efa783 100644
--- a/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html
+++ b/docs/d6/d77/dash__iop__mpd__notifier_8h_source.html
@@ -168,8 +168,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="comment">// Testing only method. Sets mpd_builder_.</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordtype">void</span> SetMpdBuilderForTesting(scoped_ptr&lt;MpdBuilder&gt; mpd_builder) {</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    mpd_builder_ = mpd_builder.Pass();</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordtype">void</span> SetMpdBuilderForTesting(std::unique_ptr&lt;MpdBuilder&gt; mpd_builder) {</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    mpd_builder_ = std::move(mpd_builder);</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;  std::map&lt;std::string, std::list&lt;AdaptationSet*&gt;&gt; adaptation_set_list_map_;</div>
@@ -180,7 +180,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">// MPD output path.</span></div>
 <div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  std::string output_path_;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  scoped_ptr&lt;MpdBuilder&gt; mpd_builder_;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  std::unique_ptr&lt;MpdBuilder&gt; mpd_builder_;</div>
 <div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  base::Lock lock_;</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">// Next group ID to use for AdapationSets that can be grouped.</span></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8784656f99..ab9cd5da40 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 02bc2596b3..3f704ae35b 100644
--- a/docs/d6/d7b/webm__tracks__parser_8h_source.html
+++ b/docs/d6/d7b/webm__tracks__parser_8h_source.html
@@ -95,106 +95,105 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;map&gt;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;set&gt;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;string&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/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/time/time.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/audio_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/base/text_track_config.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/formats/webm/webm_audio_client.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_content_encodings_client.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/webm/webm_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/webm/webm_video_client.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;</div>
-<div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</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="l00029"></a><span class="lineno">   29</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a>(<span class="keywordtype">bool</span> ignore_text_tracks);</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  ~<a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a>() <span class="keyword">override</span>;</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;  <span class="keywordtype">int</span> <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#aa4b6d4ac9fa57b47cbc17ee7c1bd3639">Parse</a>(<span class="keyword">const</span> uint8_t* buf, <span class="keywordtype">int</span> size);</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;  int64_t audio_track_num()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> audio_track_num_; }</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  int64_t video_track_num()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> video_track_num_; }</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  int64_t <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#a554135ee3a8ad995beeab868c67aba36">GetAudioDefaultDuration</a>(<span class="keyword">const</span> <span class="keywordtype">double</span> timecode_scale_in_us) <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  int64_t GetVideoDefaultDuration(<span class="keyword">const</span> <span class="keywordtype">double</span> timecode_scale_in_us) <span class="keyword">const</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="keyword">const</span> std::set&lt;int64_t&gt;&amp; ignored_tracks()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> ignored_tracks_; }</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">const</span> std::string&amp; audio_encryption_key_id()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordflow">return</span> audio_encryption_key_id_;</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;  scoped_refptr&lt;AudioStreamInfo&gt; audio_stream_info() {</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    <span class="keywordflow">return</span> audio_stream_info_;</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="keyword">const</span> std::string&amp; video_encryption_key_id()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    <span class="keywordflow">return</span> video_encryption_key_id_;</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;  scoped_refptr&lt;VideoStreamInfo&gt; video_stream_info() {</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    <span class="keywordflow">return</span> video_stream_info_;</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">   67</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, TextTrackConfig&gt; TextTracks;</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">const</span> TextTracks&amp; text_tracks()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">return</span> text_tracks_;</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="keyword">private</span>:</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// WebMParserClient implementation.</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* OnListStart(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</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="l00077"></a><span class="lineno">   77</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="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">bool</span> OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</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="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordtype">bool</span> OnString(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> std::string&amp; str) <span class="keyword">override</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;  int64_t track_type_;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  int64_t track_num_;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  std::string track_name_;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  std::string track_language_;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  std::string codec_id_;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  std::vector&lt;uint8_t&gt; codec_private_;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  int64_t seek_preroll_;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  int64_t codec_delay_;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  int64_t default_duration_;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  scoped_ptr&lt;WebMContentEncodingsClient&gt; track_content_encodings_client_;</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;  int64_t audio_track_num_;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  int64_t audio_default_duration_;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  int64_t video_track_num_;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  int64_t video_default_duration_;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="keywordtype">bool</span> ignore_text_tracks_;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  TextTracks text_tracks_;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  std::set&lt;int64_t&gt; ignored_tracks_;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  std::string audio_encryption_key_id_;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  std::string video_encryption_key_id_;</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;  <a class="code" href="../../d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html">WebMAudioClient</a> audio_client_;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  scoped_refptr&lt;AudioStreamInfo&gt; audio_stream_info_;</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;  <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html">WebMVideoClient</a> video_client_;</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  scoped_refptr&lt;VideoStreamInfo&gt; video_stream_info_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a>);</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;set&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/base/time/time.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/text_track_config.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/formats/webm/webm_audio_client.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_content_encodings_client.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_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/webm/webm_video_client.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;</div>
+<div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">   27</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</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="l00028"></a><span class="lineno">   28</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a>(<span class="keywordtype">bool</span> ignore_text_tracks);</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  ~<a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keywordtype">int</span> <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#aa4b6d4ac9fa57b47cbc17ee7c1bd3639">Parse</a>(<span class="keyword">const</span> uint8_t* buf, <span class="keywordtype">int</span> size);</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;  int64_t audio_track_num()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> audio_track_num_; }</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  int64_t video_track_num()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> video_track_num_; }</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  int64_t <a class="code" href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html#a554135ee3a8ad995beeab868c67aba36">GetAudioDefaultDuration</a>(<span class="keyword">const</span> <span class="keywordtype">double</span> timecode_scale_in_us) <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  int64_t GetVideoDefaultDuration(<span class="keyword">const</span> <span class="keywordtype">double</span> timecode_scale_in_us) <span class="keyword">const</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="keyword">const</span> std::set&lt;int64_t&gt;&amp; ignored_tracks()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> ignored_tracks_; }</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">const</span> std::string&amp; audio_encryption_key_id()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="keywordflow">return</span> audio_encryption_key_id_;</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;  scoped_refptr&lt;AudioStreamInfo&gt; audio_stream_info() {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <span class="keywordflow">return</span> audio_stream_info_;</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;  <span class="keyword">const</span> std::string&amp; video_encryption_key_id()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordflow">return</span> video_encryption_key_id_;</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;  scoped_refptr&lt;VideoStreamInfo&gt; video_stream_info() {</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordflow">return</span> video_stream_info_;</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="keyword">typedef</span> std::map&lt;int, TextTrackConfig&gt; TextTracks;</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">const</span> TextTracks&amp; text_tracks()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    <span class="keywordflow">return</span> text_tracks_;</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="keyword">private</span>:</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// WebMParserClient implementation.</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <a class="code" href="../../d5/dec/classshaka_1_1media_1_1WebMParserClient.html">WebMParserClient</a>* OnListStart(<span class="keywordtype">int</span> <span class="keywordtype">id</span>) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</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="l00076"></a><span class="lineno">   76</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="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">bool</span> OnFloat(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keywordtype">double</span> val) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</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="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordtype">bool</span> OnString(<span class="keywordtype">int</span> <span class="keywordtype">id</span>, <span class="keyword">const</span> std::string&amp; str) <span class="keyword">override</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;  int64_t track_type_;</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  int64_t track_num_;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  std::string track_name_;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  std::string track_language_;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  std::string codec_id_;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  std::vector&lt;uint8_t&gt; codec_private_;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  int64_t seek_preroll_;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  int64_t codec_delay_;</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  int64_t default_duration_;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  std::unique_ptr&lt;WebMContentEncodingsClient&gt; track_content_encodings_client_;</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;  int64_t audio_track_num_;</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  int64_t audio_default_duration_;</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  int64_t video_track_num_;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  int64_t video_default_duration_;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordtype">bool</span> ignore_text_tracks_;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  TextTracks text_tracks_;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  std::set&lt;int64_t&gt; ignored_tracks_;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  std::string audio_encryption_key_id_;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  std::string video_encryption_key_id_;</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;  <a class="code" href="../../d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html">WebMAudioClient</a> audio_client_;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  scoped_refptr&lt;AudioStreamInfo&gt; audio_stream_info_;</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;  <a class="code" href="../../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html">WebMVideoClient</a> video_client_;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  scoped_refptr&lt;VideoStreamInfo&gt; video_stream_info_;</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="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">WebMTracksParser</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_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_</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_1WebMTracksParser_html"><div class="ttname"><a href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">shaka::media::WebMTracksParser</a></div><div class="ttdoc">Parser for WebM Tracks element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d7b/webm__tracks__parser_8h_source.html#l00028">webm_tracks_parser.h:28</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1WebMTracksParser_html"><div class="ttname"><a href="../../d8/d86/classshaka_1_1media_1_1WebMTracksParser.html">shaka::media::WebMTracksParser</a></div><div class="ttdoc">Parser for WebM Tracks element. </div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d7b/webm__tracks__parser_8h_source.html#l00027">webm_tracks_parser.h:27</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_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_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>
@@ -202,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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 53647db03e..c4ad78f8bb 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 07eddf702a..7ba4a07c9c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 06fabdba15..6022a83ba8 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 0746aa8f7a..e0d30c62c6 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 91e88f60c4..cd49917023 100644
--- a/docs/d6/d9b/h264__parser_8h_source.html
+++ b/docs/d6/d9b/h264__parser_8h_source.html
@@ -439,7 +439,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 bfbed3597c..9b3808a90e 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b0b099d5e1..e4f5ecb790 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 f77477d9f4..b666e679c7 100644
--- a/docs/d6/da3/mpd__builder_8h_source.html
+++ b/docs/d6/da3/mpd__builder_8h_source.html
@@ -164,8 +164,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#a723afe73b9d619a1178ae21e46fd7450">  105</a></span>&#160;<span class="comment"></span>  <span class="keywordtype">void</span> <a class="code" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">InjectClockForTesting</a>(scoped_ptr&lt;base::Clock&gt; clock) {</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    clock_ = clock.Pass();</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>
@@ -219,7 +219,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;base::Clock&gt; clock_;</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>
@@ -424,11 +424,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#ad029323166bb60175a2369c3e887dca0">Representation</a>(</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;      scoped_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener);</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>
@@ -480,7 +480,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener_;</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="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>
@@ -492,23 +492,22 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00128">xml_node.h:128</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_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_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#l00031">xml_node.h:31</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_1Representation_html_ad029323166bb60175a2369c3e887dca0"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, scoped_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="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_1MpdBuilder_html_a723afe73b9d619a1178ae21e46fd7450"><div class="ttname"><a href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">shaka::MpdBuilder::InjectClockForTesting</a></div><div class="ttdeci">void InjectClockForTesting(scoped_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_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>
@@ -527,6 +526,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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="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>
@@ -534,7 +534,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 444bfac603..d302856c26 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fc84edf9c2..75da80f897 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 1330dc163a..13a97b8498 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 97eadb52fd..aec7cee0d2 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 7057dd1d6f..ed9a20c59d 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d417ebeaad..2125d3a3f6 100644
--- a/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html
+++ b/docs/d6/db1/classshaka_1_1media_1_1VideoStreamInfo.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 a602b2eebb..c1a4cfcd9c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 cc0a62bbe5..201d3722d1 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
@@ -95,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <table class="directory">
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EmitSampleCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParser</b>(uint32_t pid) (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, scoped_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, std::unique_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>Flush</b>() override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>NewStreamInfoCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>Parse</b>(const uint8_t *buf, int size, int64_t pts, int64_t dts) override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 0266b6189b..5b810d3e42 100644
--- a/docs/d6/dc8/mkv__writer_8cc_source.html
+++ b/docs/d6/dc8/mkv__writer_8cc_source.html
@@ -186,7 +186,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html_ab331684a758a93bf0c77fa224fe429ea"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#ab331684a758a93bf0c77fa224fe429ea">shaka::media::MkvWriter::WriteFromFile</a></div><div class="ttdeci">int64_t WriteFromFile(File *source)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/dc8/mkv__writer_8cc_source.html#l00056">mkv_writer.cc:56</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html_a6603ba573e802e660921f329192738f3"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a6603ba573e802e660921f329192738f3">shaka::media::MkvWriter::ElementStartNotify</a></div><div class="ttdeci">void ElementStartNotify(mkvmuxer::uint64 element_id, mkvmuxer::int64 position) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/dc8/mkv__writer_8cc_source.html#l00090">mkv_writer.cc:90</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>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00236">file.cc:236</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a1c218b7f815bae0f48800b385ddce67e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e">shaka::media::File::CopyFile</a></div><div class="ttdeci">static int64_t CopyFile(File *source, File *destination)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00233">file.cc:233</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_1MkvWriter_html_a8d0429e7922752db3f01d43e6340465a"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a8d0429e7922752db3f01d43e6340465a">shaka::media::MkvWriter::Seekable</a></div><div class="ttdeci">bool Seekable() const override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/dc8/mkv__writer_8cc_source.html#l00086">mkv_writer.cc:86</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html_a9490dbf4bc02903484acb68f038f7fe2"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a9490dbf4bc02903484acb68f038f7fe2">shaka::media::MkvWriter::Open</a></div><div class="ttdeci">Status Open(const std::string &amp;name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/dc8/mkv__writer_8cc_source.html#l00016">mkv_writer.cc:16</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 450c2a5cb1..971a2e0805 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a922b6e66d..b45beedf4f 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 7c6643fae6..54a44ede39 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 729dd6f505..ca7666a599 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 582c478462..4fe269bd86 100644
--- a/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html
+++ b/docs/d6/dd0/structshaka_1_1media_1_1H264SEIMessage.html
@@ -127,7 +127,7 @@ union {</td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 03057ddc06..5d86a43a92 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 0d11cbc3ba..8ee26509ae 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 54bcba1bec..5b2b98aa5e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b345cc0e39..d2e0ce9c79 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 7746360253..e898afb44a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 5f7443c1f8..daa3684815 100644
--- a/docs/d6/de9/ts__segmenter_8cc_source.html
+++ b/docs/d6/de9/ts__segmenter_8cc_source.html
@@ -134,7 +134,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">if</span> (encryption_key_source) {</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
 <div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">const</span> KeySource::TrackType type =</div>
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        GetTrackTypeForEncryption(stream_info, max_sd_pixels);</div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = encryption_key_source-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(type, encryption_key.get());</div>
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;      <span class="keywordflow">return</span> status;</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;    encryption_key_ = encryption_key.Pass();</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    encryption_key_ = std::move(encryption_key);</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    clear_lead_in_seconds_ = clear_lead_in_seconds;</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="keywordflow">if</span> (listener_) {</div>
@@ -198,13 +198,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordflow">return</span> WritePesPacketsToFile();</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"><a class="line" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">  112</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">TsSegmenter::InjectTsWriterForTesting</a>(scoped_ptr&lt;TsWriter&gt; writer) {</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  ts_writer_ = writer.Pass();</div>
+<div class="line"><a name="l00112"></a><span class="lineno"><a class="line" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">  112</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">TsSegmenter::InjectTsWriterForTesting</a>(std::unique_ptr&lt;TsWriter&gt; writer) {</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  ts_writer_ = std::move(writer);</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="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">  116</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">TsSegmenter::InjectPesPacketGeneratorForTesting</a>(</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    scoped_ptr&lt;PesPacketGenerator&gt; generator) {</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  pes_packet_generator_ = generator.Pass();</div>
+<div class="line"><a name="l00116"></a><span class="lineno"><a class="line" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">  116</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">TsSegmenter::InjectPesPacketGeneratorForTesting</a>(</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    std::unique_ptr&lt;PesPacketGenerator&gt; generator) {</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;  pes_packet_generator_ = std::move(generator);</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"><a class="line" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">  121</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">TsSegmenter::SetTsWriterFileOpenedForTesting</a>(<span class="keywordtype">bool</span> value) {</div>
@@ -227,14 +227,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> TsSegmenter::WritePesPacketsToFile() {</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordflow">while</span> (pes_packet_generator_-&gt;NumberOfReadyPesPackets() &gt; 0u) {</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    scoped_ptr&lt;PesPacket&gt; pes_packet =</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    std::unique_ptr&lt;PesPacket&gt; pes_packet =</div>
 <div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        pes_packet_generator_-&gt;GetNextPesPacket();</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;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = OpenNewSegmentIfClosed(pes_packet-&gt;pts());</div>
 <div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;      <span class="keywordflow">return</span> status;</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> (!ts_writer_-&gt;AddPesPacket(pes_packet.Pass()))</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;    <span class="keywordflow">if</span> (!ts_writer_-&gt;AddPesPacket(std::move(pes_packet)))</div>
 <div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;      <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::MUXER_FAILURE, <span class="stringliteral">&quot;Failed to add PES packet.&quot;</span>);</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">return</span> Status::OK;</div>
@@ -276,7 +276,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;    <span class="keywordflow">if</span> (listener_)</div>
 <div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;      listener_-&gt;<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a897463091f0effa647a8e2822f48b2ee">OnEncryptionStart</a>();</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> (!pes_packet_generator_-&gt;SetEncryptionKey(encryption_key_.Pass()))</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;    <span class="keywordflow">if</span> (!pes_packet_generator_-&gt;SetEncryptionKey(std::move(encryption_key_)))</div>
 <div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;      <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Failed to set encryption key.&quot;</span>);</div>
 <div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;    ts_writer_-&gt;SignalEncrypted();</div>
 <div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  }</div>
@@ -295,16 +295,16 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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"><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_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_a2bf9d53ebc0a42551e7c460d9464650d"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">shaka::media::mp2t::TsSegmenter::InjectTsWriterForTesting</a></div><div class="ttdeci">void InjectTsWriterForTesting(scoped_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>
 <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#l00020">key_source.h:20</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_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_a01c6ce7398b8e7a9966959dadcd30b25"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">shaka::media::mp2t::TsSegmenter::InjectPesPacketGeneratorForTesting</a></div><div class="ttdeci">void InjectPesPacketGeneratorForTesting(scoped_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_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>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d8/dca/ts__writer_8h_source.html#l00028">ts_writer.h:28</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00180">file.cc:180</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00177">file.cc:177</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#l00031">key_source.h:31</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="structshaka_1_1media_1_1MuxerOptions_html_a930587b1f3a3e38cf1e7974f01d8ce1e"><div class="ttname"><a href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a930587b1f3a3e38cf1e7974f01d8ce1e">shaka::media::MuxerOptions::bandwidth</a></div><div class="ttdeci">uint32_t bandwidth</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d0e/muxer__options_8h_source.html#l00075">muxer_options.h:75</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html_a412be69ae8e18c5ceb3c48d1559c79c2"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2">shaka::media::mp2t::TsSegmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const StreamInfo &amp;stream_info, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00034">ts_segmenter.cc:34</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d08335f49d..da8b119d95 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 f8cd225e9f..544ca35e67 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d8cc6f4a27..9f642281a6 100644
--- a/docs/d6/dff/classshaka_1_1media_1_1Nalu.html
+++ b/docs/d6/dff/classshaka_1_1media_1_1Nalu.html
@@ -240,7 +240,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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 43e53993d4..e9af968d14 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 a52fd3399a..f257f378d5 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 46a63a611a..7663708d0d 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 56b5a5ed55..0ecae8719f 100644
--- a/docs/d7/d12/media__parser_8h_source.html
+++ b/docs/d7/d12/media__parser_8h_source.html
@@ -96,61 +96,60 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_BASE_MEDIA_PARSER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_MEDIA_PARSER_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;string&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="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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;<span class="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.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/memory/scoped_ptr.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/container_names.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>KeySource;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">class </span>MediaSample;</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"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">   26</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a> {</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a>() {}</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a>() {}</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keyword">typedef</span> base::Callback&lt;</div>
-<div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">   35</a></span>&#160;      void(<span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;&amp; stream_info)&gt; <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</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">typedef</span> base::Callback&lt;bool(uint32_t track_id,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                              <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; media_sample)&gt;</div>
-<div class="line"><a name="l00044"></a><span class="lineno"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">   44</a></span>&#160;      <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                    <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) = 0;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a26752164d7e8ae6a9a894512291ad9cd">Flush</a>() WARN_UNUSED_RESULT = 0;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  virtual <span class="keywordtype">bool</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0c85f3cb0591f67c036276be82a1ba9d">Parse</a>(const uint8_t* buf, <span class="keywordtype">int</span> size) WARN_UNUSED_RESULT = 0;</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; private:</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</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;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_MEDIA_PARSER_H_</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#l00026">media_parser.h:26</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#l00035">media_parser.h:35</a></div></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/container_names.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>KeySource;</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="keyword">class </span>MediaSample;</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"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">   25</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a> {</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a>() {}</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a>() {}</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keyword">typedef</span> base::Callback&lt;</div>
+<div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">   34</a></span>&#160;      void(<span class="keyword">const</span> std::vector&lt;scoped_refptr&lt;StreamInfo&gt; &gt;&amp; stream_info)&gt; <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</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">typedef</span> base::Callback&lt;bool(uint32_t track_id,</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                              <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; media_sample)&gt;</div>
+<div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">   43</a></span>&#160;      <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;                    <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) = 0;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a26752164d7e8ae6a9a894512291ad9cd">Flush</a>() WARN_UNUSED_RESULT = 0;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  virtual <span class="keywordtype">bool</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0c85f3cb0591f67c036276be82a1ba9d">Parse</a>(const uint8_t* buf, <span class="keywordtype">int</span> size) WARN_UNUSED_RESULT = 0;</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; private:</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</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;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_MEDIA_PARSER_H_</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_1MediaParser_html_a0c85f3cb0591f67c036276be82a1ba9d"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0c85f3cb0591f67c036276be82a1ba9d">shaka::media::MediaParser::Parse</a></div><div class="ttdeci">virtual bool Parse(const uint8_t *buf, int size) WARN_UNUSED_RESULT=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaParser_html_adc7c91bebe75879abba91a56dae52153"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153">shaka::media::MediaParser::Init</a></div><div class="ttdeci">virtual void Init(const InitCB &amp;init_cb, const NewSampleCB &amp;new_sample_cb, KeySource *decryption_key_source)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaParser_html_a26752164d7e8ae6a9a894512291ad9cd"><div class="ttname"><a href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a26752164d7e8ae6a9a894512291ad9cd">shaka::media::MediaParser::Flush</a></div><div class="ttdeci">virtual bool Flush() WARN_UNUSED_RESULT=0</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1d730db446..96a37678e9 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 5ae87581d0..d48cc60122 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 0d38d2f0d0..846b516567 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 5e0206d7b1..940db3772e 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0efa0f4c3b..0ae99a2c4c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 4c235e86ab..b9715a412e 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 f501c4dda8..58b9415e92 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bbb9a10961..c39dcdfec6 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 7e36fe4954..fe775b6f3c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 a8ae38ac16..54f0368003 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 7ee5681026..67bb72e38b 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 07ac0465a4..8aab37acca 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 802d153962..6f4cbcb38c 100644
--- a/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html
+++ b/docs/d7/d59/classshaka_1_1media_1_1DecryptorSource.html
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 2d6536248b..49971a3728 100644
--- a/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html
+++ b/docs/d7/d6d/classshaka_1_1media_1_1MediaSample.html
@@ -198,7 +198,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>base::RefCountedThre
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Class to hold a media sample. </p>
 
-<p>Definition at line <a class="el" href="../../dd/d80/media__sample_8h_source.html#l00022">22</a> of file <a class="el" href="../../dd/d80/media__sample_8h_source.html">media_sample.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d80/media__sample_8h_source.html#l00021">21</a> of file <a class="el" href="../../dd/d80/media__sample_8h_source.html">media_sample.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a3fac8e4cc8da3b34ef5f698411ec868b"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b187bdd7af..deb9102604 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 ca70003cee..342f6b36d4 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d730de197e..d611e3d8b3 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 59fa038ed2..a024b17ed8 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 77fe178a80..5a70c35078 100644
--- a/docs/d7/d87/video__stream__info_8h_source.html
+++ b/docs/d7/d87/video__stream__info_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b35a8b88cf..7cd6a03d88 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 7ebdf6f3ff..6234d275b1 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 710ec37784..b931f41982 100644
--- a/docs/d7/da4/track__run__iterator_8h_source.html
+++ b/docs/d7/da4/track__run__iterator_8h_source.html
@@ -94,9 +94,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<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/media/formats/mp4/box_definitions.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>
@@ -147,7 +147,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  int64_t duration() <span class="keyword">const</span>;</div>
 <div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="keywordtype">bool</span> is_keyframe() <span class="keyword">const</span>;</div>
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  scoped_ptr&lt;DecryptConfig&gt; <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">GetDecryptConfig</a>();</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  std::unique_ptr&lt;DecryptConfig&gt; <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">GetDecryptConfig</a>();</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="keyword">private</span>:</div>
 <div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">void</span> ResetRun();</div>
@@ -174,7 +174,6 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_a1badd6160074e1bc2ef0f1e289a81524"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">shaka::media::mp4::TrackRunIterator::GetDecryptConfig</a></div><div class="ttdeci">scoped_ptr&lt; DecryptConfig &gt; GetDecryptConfig()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00591">track_run_iterator.cc:591</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html">shaka::media::mp4::TrackRunIterator</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/da4/track__run__iterator_8h_source.html#l00023">track_run_iterator.h:23</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_aee813f01267e89ff00fdb836bb3a159d"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#aee813f01267e89ff00fdb836bb3a159d">shaka::media::mp4::TrackRunIterator::video_description</a></div><div class="ttdeci">const VideoSampleEntry &amp; video_description() const </div><div class="ttdoc">Only valid if is_video() is true. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00548">track_run_iterator.cc:548</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1AudioSampleEntry_html"><div class="ttname"><a href="../../d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampleEntry.html">shaka::media::mp4::AudioSampleEntry</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00345">box_definitions.h:345</a></div></div>
@@ -185,6 +184,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_a6ff6e2ce67a54051c5a7e39dfadcb48d"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a6ff6e2ce67a54051c5a7e39dfadcb48d">shaka::media::mp4::TrackRunIterator::AdvanceSample</a></div><div class="ttdeci">void AdvanceSample()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00441">track_run_iterator.cc:441</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1TrackEncryption_html"><div class="ttname"><a href="../../db/db8/structshaka_1_1media_1_1mp4_1_1TrackEncryption.html">shaka::media::mp4::TrackEncryption</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00144">box_definitions.h:144</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1Movie_html"><div class="ttname"><a href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">shaka::media::mp4::Movie</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00656">box_definitions.h:656</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_af1dbb0a9037617c2b80506ee161dfcfa"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">shaka::media::mp4::TrackRunIterator::GetDecryptConfig</a></div><div class="ttdeci">std::unique_ptr&lt; DecryptConfig &gt; GetDecryptConfig()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00591">track_run_iterator.cc:591</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_1TrackRunIterator_html_adb40e673e8025ca51740a50eb20d89b2"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#adb40e673e8025ca51740a50eb20d89b2">shaka::media::mp4::TrackRunIterator::audio_description</a></div><div class="ttdeci">const AudioSampleEntry &amp; audio_description() const </div><div class="ttdoc">Only valid if is_audio() is true. </div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00542">track_run_iterator.cc:542</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_a8d4fb433e66fec693035cac796ca6851"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a8d4fb433e66fec693035cac796ca6851">shaka::media::mp4::TrackRunIterator::AuxInfoNeedsToBeCached</a></div><div class="ttdeci">bool AuxInfoNeedsToBeCached()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00450">track_run_iterator.cc:450</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 51d6a3cc01..55483b2598 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 cd892b6223..4d40a8a084 100644
--- a/docs/d7/db0/mpd__writer_8h_source.html
+++ b/docs/d7/db0/mpd__writer_8h_source.html
@@ -99,11 +99,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MPD_UTIL_MPD_WRITER_H_</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;list&gt;</span></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/macros.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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">#include &quot;packager/base/macros.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/mpd_notifier.h&quot;</span></div>
 <div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/mpd_options.h&quot;</span></div>
 <div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;</div>
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="../../d4/db4/classshaka_1_1MpdNotifierFactory.html">MpdNotifierFactory</a>() {}</div>
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d4/db4/classshaka_1_1MpdNotifierFactory.html">MpdNotifierFactory</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;  <span class="keyword">virtual</span> scoped_ptr&lt;MpdNotifier&gt; Create(</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keyword">virtual</span> std::unique_ptr&lt;MpdNotifier&gt; Create(</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      DashProfile dash_profile,</div>
 <div class="line"><a name="l00039"></a><span class="lineno">   39</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="l00040"></a><span class="lineno">   40</span>&#160;      <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
@@ -163,26 +163,27 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160; <span class="keyword">private</span>:</div>
 <div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>MpdWriterTest;</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">void</span> SetMpdNotifierFactoryForTest(scoped_ptr&lt;MpdNotifierFactory&gt; factory);</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;  std::list&lt;MediaInfo&gt; media_infos_;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  std::vector&lt;std::string&gt; base_urls_;</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;  scoped_ptr&lt;MpdNotifierFactory&gt; notifier_factory_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/dcd/classshaka_1_1MpdWriter.html">MpdWriter</a>);</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;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MPD_UTIL_MPD_WRITER_H_</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordtype">void</span> SetMpdNotifierFactoryForTest(</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;      std::unique_ptr&lt;MpdNotifierFactory&gt; factory);</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;  std::list&lt;MediaInfo&gt; media_infos_;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  std::vector&lt;std::string&gt; base_urls_;</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;  std::unique_ptr&lt;MpdNotifierFactory&gt; notifier_factory_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/dcd/classshaka_1_1MpdWriter.html">MpdWriter</a>);</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="comment">// namespace shaka</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="preprocessor">#endif  // MPD_UTIL_MPD_WRITER_H_</span></div>
 <div class="ttc" id="classshaka_1_1MpdWriter_html"><div class="ttname"><a href="../../db/dcd/classshaka_1_1MpdWriter.html">shaka::MpdWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/db0/mpd__writer_8h_source.html#l00051">mpd_writer.h:51</a></div></div>
 <div class="ttc" id="classshaka_1_1MpdNotifierFactory_html"><div class="ttname"><a href="../../d4/db4/classshaka_1_1MpdNotifierFactory.html">shaka::MpdNotifierFactory</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/db0/mpd__writer_8h_source.html#l00032">mpd_writer.h:32</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 95ebd886c5..aaf38be21e 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4b2c161378..cf10df86ec 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 c8f5670854..7d5ce15dd1 100644
--- a/docs/d7/dc6/byte__queue_8h_source.html
+++ b/docs/d7/dc6/byte__queue_8h_source.html
@@ -96,55 +96,57 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&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="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="l00020"></a><span class="lineno"><a class="line" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">   20</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> {</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>();</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  ~<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>();</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">Reset</a>();</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;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">Push</a>(<span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size);</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">Peek</a>(<span class="keyword">const</span> uint8_t** data, <span class="keywordtype">int</span>* size) <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(<span class="keywordtype">int</span> count);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="comment">// Returns a pointer to the front of the queue.</span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  uint8_t* front() <span class="keyword">const</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;  scoped_ptr&lt;uint8_t[]&gt; buffer_;</div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/macros.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="l00022"></a><span class="lineno"><a class="line" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</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="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>();</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  ~<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>();</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">Reset</a>();</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> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">Push</a>(<span class="keyword">const</span> uint8_t* data, <span class="keywordtype">int</span> size);</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">Peek</a>(<span class="keyword">const</span> uint8_t** data, <span class="keywordtype">int</span>* size) <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop</a>(<span class="keywordtype">int</span> count);</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">private</span>:</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="comment">// Returns a pointer to the front of the queue.</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  uint8_t* front() <span class="keyword">const</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="comment">// Size of |buffer_|.</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordtype">size_t</span> size_;</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">// Offset from the start of |buffer_| that marks the front of the queue.</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordtype">size_t</span> offset_;</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">// Number of bytes stored in the queue.</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keywordtype">int</span> used_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>);</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">// namespace media</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_BYTE_QUEUE_H_</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; buffer_;</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">// Size of |buffer_|.</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keywordtype">size_t</span> size_;</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">// Offset from the start of |buffer_| that marks the front of the queue.</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">size_t</span> offset_;</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="comment">// Number of bytes stored in the queue.</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">int</span> used_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a>);</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">// namespace media</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_BYTE_QUEUE_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_acea792e406efe5119cec2e3e522e02c2"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2">shaka::media::ByteQueue::Push</a></div><div class="ttdeci">void Push(const uint8_t *data, int size)</div><div class="ttdoc">Append new bytes to the end of the queue. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00029">byte_queue.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_a31b30d39d14fca3ce722b4233de95c79"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">shaka::media::ByteQueue::Pop</a></div><div class="ttdeci">void Pop(int count)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00070">byte_queue.cc:70</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_ab1659ef71098c37e9fb4e55ab1664e84"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">shaka::media::ByteQueue::Reset</a></div><div class="ttdeci">void Reset()</div><div class="ttdoc">Reset the queue to the empty state. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00024">byte_queue.cc:24</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1ByteQueue_html_a838fe5642e533477a5e229981e5f06e7"><div class="ttname"><a href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">shaka::media::ByteQueue::Peek</a></div><div class="ttdeci">void Peek(const uint8_t **data, int *size) const </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/df9/byte__queue_8cc_source.html#l00063">byte_queue.cc:63</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#l00020">byte_queue.h:20</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 8468eabcaa..22137b95fe 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8febcb9e3d..20ac031f26 100644
--- a/docs/d7/dd4/request__signer_8h_source.html
+++ b/docs/d7/dd4/request__signer_8h_source.html
@@ -96,89 +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">#ifndef MEDIA_BASE_REQUEST_SIGNER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_REQUEST_SIGNER_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;string&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/memory/scoped_ptr.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;<span class="keyword">class </span>AesCbcEncryptor;</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="keyword">class </span>RsaPrivateKey;</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="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</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">virtual</span> ~<a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>();</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html#a1c77d503f9ffc3462c1bf45b4f35bf32">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                                 std::string* signature) = 0;</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> std::string&amp; signer_name()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> signer_name_; }</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">protected</span>:</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  std::string signer_name_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>);</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="l00043"></a><span class="lineno"><a class="line" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">   43</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a> : <span class="keyword">public</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> {</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  ~<a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keyword">static</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>* <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c">CreateSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                                        <span class="keyword">const</span> std::string&amp; aes_key_hex,</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                        <span class="keyword">const</span> std::string&amp; iv_hex);</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a3010ad8c4c1588358a8d31a97afd6428">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                         std::string* signature) <span class="keyword">override</span>;</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="keyword">private</span>:</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                   scoped_ptr&lt;AesCbcEncryptor&gt; encryptor);</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;  scoped_ptr&lt;AesCbcEncryptor&gt; aes_cbc_encryptor_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>);</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="l00067"></a><span class="lineno"><a class="line" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">   67</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a> : <span class="keyword">public</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> {</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  ~<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>() <span class="keyword">override</span>;</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="keyword">static</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>* <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">CreateSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                                        <span class="keyword">const</span> std::string&amp; pkcs1_rsa_key);</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;                         std::string* signature) <span class="keyword">override</span>;</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="keyword">private</span>:</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;                   scoped_ptr&lt;RsaPrivateKey&gt; rsa_private_key);</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;  scoped_ptr&lt;RsaPrivateKey&gt; rsa_private_key_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>);</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_REQUEST_SIGNER_H_</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#l00063">request_signer.cc:63</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1RequestSigner_html"><div class="ttname"><a href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">shaka::media::RequestSigner</a></div><div class="ttdoc">Abstract class used for signature generation. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00021">request_signer.h:21</a></div></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/macros.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">class </span>AesCbcEncryptor;</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">class </span>RsaPrivateKey;</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="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</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">virtual</span> ~<a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>();</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html#a1c77d503f9ffc3462c1bf45b4f35bf32">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                                 std::string* signature) = 0;</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> std::string&amp; signer_name()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> signer_name_; }</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">protected</span>:</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name);</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="keyword">private</span>:</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  std::string signer_name_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a>);</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="l00044"></a><span class="lineno"><a class="line" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">   44</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a> : <span class="keyword">public</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> {</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  ~<a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keyword">static</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>* <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c">CreateSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                                        <span class="keyword">const</span> std::string&amp; aes_key_hex,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                                        <span class="keyword">const</span> std::string&amp; iv_hex);</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a3010ad8c4c1588358a8d31a97afd6428">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                         std::string* signature) <span class="keyword">override</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; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                   std::unique_ptr&lt;AesCbcEncryptor&gt; encryptor);</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;  std::unique_ptr&lt;AesCbcEncryptor&gt; aes_cbc_encryptor_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html">AesRequestSigner</a>);</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="l00068"></a><span class="lineno"><a class="line" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">   68</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a> : <span class="keyword">public</span> <a class="code" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> {</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  ~<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>() <span class="keyword">override</span>;</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">   74</span>&#160;  <span class="keyword">static</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>* <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c">CreateSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                                        <span class="keyword">const</span> std::string&amp; pkcs1_rsa_key);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#ac83306b0555581b8ac9591b6e3d3bdbc">GenerateSignature</a>(<span class="keyword">const</span> std::string&amp; message,</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;                         std::string* signature) <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>(<span class="keyword">const</span> std::string&amp; signer_name,</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;                   std::unique_ptr&lt;RsaPrivateKey&gt; rsa_private_key);</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::unique_ptr&lt;RsaPrivateKey&gt; rsa_private_key_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">RsaRequestSigner</a>);</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;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_BASE_REQUEST_SIGNER_H_</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_1RequestSigner_html"><div class="ttname"><a href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">shaka::media::RequestSigner</a></div><div class="ttdoc">Abstract class used for signature generation. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00022">request_signer.h:22</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_1RsaRequestSigner_html"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">shaka::media::RsaRequestSigner</a></div><div class="ttdoc">RsaRequestSigner uses RSA-PSS signing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00067">request_signer.h:67</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1RsaRequestSigner_html"><div class="ttname"><a href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html">shaka::media::RsaRequestSigner</a></div><div class="ttdoc">RsaRequestSigner uses RSA-PSS signing. </div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dd4/request__signer_8h_source.html#l00068">request_signer.h:68</a></div></div>
 <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#l00073">request_signer.cc:73</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#l00043">request_signer.h:43</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_1RequestSigner_html_a1c77d503f9ffc3462c1bf45b4f35bf32"><div class="ttname"><a href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html#a1c77d503f9ffc3462c1bf45b4f35bf32">shaka::media::RequestSigner::GenerateSignature</a></div><div class="ttdeci">virtual bool GenerateSignature(const std::string &amp;message, std::string *signature)=0</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 364b22585f..93b13c1ddd 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
@@ -129,7 +129,7 @@ track_id, const scoped_refptr<br class="typebreak"/>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../de/d7b/mp4__media__parser_8h_source.html#l00033">33</a> of file <a class="el" href="../../de/d7b/mp4__media__parser_8h_source.html">mp4_media_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../de/d7b/mp4__media__parser_8h_source.html#l00031">31</a> of file <a class="el" href="../../de/d7b/mp4__media__parser_8h_source.html">mp4_media_parser.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a6f26e0d76aeda601fa87190901de27ea"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0a08a83e73..a3a8765e58 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 36fbfb93a0..d96211c94c 100644
--- a/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html
+++ b/docs/d7/dda/classshaka_1_1media_1_1ByteQueue.html
@@ -114,7 +114,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Represents a queue of bytes. Data is added to the end of the queue via an <a class="el" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#acea792e406efe5119cec2e3e522e02c2" title="Append new bytes to the end of the queue. ">Push()</a> and removed via <a class="el" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a31b30d39d14fca3ce722b4233de95c79">Pop()</a>. The contents of the queue can be observed via the <a class="el" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html#a838fe5642e533477a5e229981e5f06e7">Peek()</a> method. This class manages the underlying storage of the queue and tries to minimize the number of buffer copies when data is appended and removed. </p>
 
-<p>Definition at line <a class="el" href="../../d7/dc6/byte__queue_8h_source.html#l00020">20</a> of file <a class="el" href="../../d7/dc6/byte__queue_8h_source.html">byte_queue.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/dc6/byte__queue_8h_source.html#l00022">22</a> of file <a class="el" href="../../d7/dc6/byte__queue_8h_source.html">byte_queue.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a838fe5642e533477a5e229981e5f06e7"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 0f27645b0b..446848f691 100644
--- a/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html
+++ b/docs/d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html
@@ -135,7 +135,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html" title="RsaRequestSigner uses RSA-PSS signing. ">RsaRequestSigner</a> uses RSA-PSS signing. </p>
 
-<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00067">67</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00068">68</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="af6af635a7c0a01bb638befb71b88386c"></a>
 <div class="memitem">
@@ -171,7 +171,7 @@ Additional Inherited Members</h2></td></tr>
 <p>Create an RsaSigner object using a DER encoded PKCS#1 RSAPrivateKey. </p>
 <dl class="section return"><dt>Returns</dt><dd>The created <a class="el" href="../../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html" title="RsaRequestSigner uses RSA-PSS signing. ">RsaRequestSigner</a> object on success, NULL otherwise. </dd></dl>
 
-<p>Definition at line <a class="el" href="../../d4/df5/request__signer_8cc_source.html#l00063">63</a> of file <a class="el" href="../../d4/df5/request__signer_8cc_source.html">request_signer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d4/df5/request__signer_8cc_source.html#l00064">64</a> of file <a class="el" href="../../d4/df5/request__signer_8cc_source.html">request_signer.cc</a>.</p>
 
 </div>
 </div>
@@ -182,7 +182,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f72fedcdf2..9766d5eff6 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 e6312c97e4..2104d85ed9 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9fc797a6de..faaecdeccd 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1a9d35e272..e9046ed8a6 100644
--- a/docs/d7/dee/mpd__generator_8cc_source.html
+++ b/docs/d7/dee/mpd__generator_8cc_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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 a5678c412e..052691966c 100644
--- a/docs/d7/def/mp4__media__parser_8cc_source.html
+++ b/docs/d7/def/mp4__media__parser_8cc_source.html
@@ -245,7 +245,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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"><a class="line" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">  158</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">MP4MediaParser::LoadMoov</a>(<span class="keyword">const</span> std::string&amp; file_path) {</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; file(</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; file(</div>
 <div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;      <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">File::OpenWithNoBuffering</a>(file_path.c_str(), <span class="stringliteral">&quot;r&quot;</span>));</div>
 <div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keywordflow">if</span> (!file) {</div>
 <div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unable to open media file &#39;&quot;</span> &lt;&lt; file_path &lt;&lt; <span class="stringliteral">&quot;&#39;&quot;</span>;</div>
@@ -326,7 +326,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  <span class="keywordflow">if</span> (!size)</div>
 <div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;  scoped_ptr&lt;BoxReader&gt; reader(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#ae348922875d67128d2af6d88b692e205">BoxReader::ReadBox</a>(buf, size, err));</div>
+<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  std::unique_ptr&lt;BoxReader&gt; reader(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html#ae348922875d67128d2af6d88b692e205">BoxReader::ReadBox</a>(buf, size, err));</div>
 <div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;  <span class="keywordflow">if</span> (reader.get() == NULL)</div>
 <div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;</div>
@@ -779,7 +779,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00690"></a><span class="lineno">  690</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l00691"></a><span class="lineno">  691</span>&#160;    }</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">  693</span>&#160;    scoped_ptr&lt;DecryptConfig&gt; decrypt_config = runs_-&gt;GetDecryptConfig();</div>
+<div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160;    std::unique_ptr&lt;DecryptConfig&gt; decrypt_config = runs_-&gt;GetDecryptConfig();</div>
 <div class="line"><a name="l00694"></a><span class="lineno">  694</span>&#160;    <span class="keywordflow">if</span> (!decrypt_config ||</div>
 <div class="line"><a name="l00695"></a><span class="lineno">  695</span>&#160;        !decryptor_source_-&gt;DecryptSampleBuffer(decrypt_config.get(),</div>
 <div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160;                                                stream_sample-&gt;writable_data(),</div>
@@ -839,14 +839,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00750"></a><span class="lineno">  750</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html_a1dfd11c891dd3b3171002cbc484eacdd"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html#a1dfd11c891dd3b3171002cbc484eacdd">shaka::media::OffsetByteQueue::head</a></div><div class="ttdeci">int64_t head()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d34/offset__byte__queue_8h_source.html#l00052">offset_byte_queue.h:52</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html_a68832e85b25a9b543e54033bb70c4df6"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html#a68832e85b25a9b543e54033bb70c4df6">shaka::media::OffsetByteQueue::PeekAt</a></div><div class="ttdeci">void PeekAt(int64_t offset, const uint8_t **buf, int *size)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d1a/offset__byte__queue_8cc_source.html#l00041">offset_byte_queue.cc:41</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00156">file.cc:156</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_ad1e9fc834093c8b35c0f8c1957974fda"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#ad1e9fc834093c8b35c0f8c1957974fda">shaka::media::File::OpenWithNoBuffering</a></div><div class="ttdeci">static File * OpenWithNoBuffering(const char *file_name, const char *mode)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00153">file.cc:153</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html_a6f26e0d76aeda601fa87190901de27ea"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a6f26e0d76aeda601fa87190901de27ea">shaka::media::mp4::MP4MediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/def/mp4__media__parser_8cc_source.html#l00117">mp4_media_parser.cc:117</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html_a77b9a12145dad80df95845bd2b66b6a8"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html#a77b9a12145dad80df95845bd2b66b6a8">shaka::media::OffsetByteQueue::Trim</a></div><div class="ttdeci">bool Trim(int64_t max_offset)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d1a/offset__byte__queue_8cc_source.html#l00051">offset_byte_queue.cc:51</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html_a4105cdbe5ece03071a17c06fb27699b0"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a4105cdbe5ece03071a17c06fb27699b0">shaka::media::mp4::MP4MediaParser::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="../../d7/def/mp4__media__parser_8cc_source.html#l00124">mp4_media_parser.cc:124</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1KeySource_html_aca6ecdac6ebc131d3626b765f64cb2de"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">shaka::media::KeySource::FetchKeys</a></div><div class="ttdeci">virtual Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AudioStreamInfo_html_aee79e7aa61b741bb96f451c6de1c9d42"><div class="ttname"><a href="../../da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html#aee79e7aa61b741bb96f451c6de1c9d42">shaka::media::AudioStreamInfo::GetCodecString</a></div><div class="ttdeci">static std::string GetCodecString(Codec codec, uint8_t audio_object_type)</div><div class="ttdef"><b>Definition:</b> <a href="../../da/d04/audio__stream__info_8cc_source.html#l00095">audio_stream_info.cc:95</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html_af0ec1b44528a2997c0d548bee47862cf"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">shaka::media::mp4::MP4MediaParser::LoadMoov</a></div><div class="ttdeci">bool LoadMoov(const std::string &amp;file_path)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/def/mp4__media__parser_8cc_source.html#l00158">mp4_media_parser.cc:158</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#l00031">key_source.h:31</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_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#l00094">mp4_media_parser.cc:94</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>
@@ -855,7 +855,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4e0536943b..2b941e35f0 100644
--- a/docs/d7/df9/byte__queue_8cc_source.html
+++ b/docs/d7/df9/byte__queue_8cc_source.html
@@ -130,7 +130,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    <span class="comment">// Sanity check to make sure we didn&#39;t overflow.</span></div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    CHECK_GT(new_size, size_);</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;    scoped_ptr&lt;uint8_t[]&gt; new_buffer(<span class="keyword">new</span> uint8_t[new_size]);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    std::unique_ptr&lt;uint8_t[]&gt; new_buffer(<span class="keyword">new</span> uint8_t[new_size]);</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">// Copy the data from the old buffer to the start of the new one.</span></div>
 <div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keywordflow">if</span> (used_ &gt; 0)</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 86370ce0f4..fc74f6b543 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 d815e039e8..d13af62bd3 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bc619fb548..727c944821 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
@@ -93,18 +93,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a>, including all inherited members.</p>
 <table class="directory">
-  <tr class="even"><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">AddPesPacket</a>(scoped_ptr&lt; PesPacket &gt; pes_packet)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">AddPesPacket</a>(std::unique_ptr&lt; PesPacket &gt; pes_packet)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#ae9979f940d7a07127709576aa1f766a1">FinalizeSegment</a>()</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6">Initialize</a>(const StreamInfo &amp;stream_info)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a9ba30b9cc1e4ae2992735709ae987c64">NewSegment</a>(const std::string &amp;file_name)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">SetProgramMapTableWriterForTesting</a>(scoped_ptr&lt; ProgramMapTableWriter &gt; table_writer)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">SetProgramMapTableWriterForTesting</a>(std::unique_ptr&lt; ProgramMapTableWriter &gt; table_writer)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#afc47f61bce7cd4f8f6a6ea0ec2c96d4c">SignalEncrypted</a>()</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>TsWriter</b>() (defined in <a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a>)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~TsWriter</b>() (defined in <a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a>)</td><td class="entry"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 849189fd4f..942026d89d 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 1784401722..6ff2a52ba2 100644
--- a/docs/d8/d0d/media__sample_8cc_source.html
+++ b/docs/d8/d0d/media__sample_8cc_source.html
@@ -189,13 +189,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1MediaSample_html_a1d23b68125525a019bde262e4c5a46f0"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a1d23b68125525a019bde262e4c5a46f0">shaka::media::MediaSample::FromMetadata</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; FromMetadata(const uint8_t *metadata, size_t metadata_size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00067">media_sample.cc:67</a></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_1MediaSample_html_aa3cbd9fee3a228403c3128be5141a614"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#aa3cbd9fee3a228403c3128be5141a614">shaka::media::MediaSample::ToString</a></div><div class="ttdeci">std::string ToString() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00084">media_sample.cc:84</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1MediaSample_html"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">shaka::media::MediaSample</a></div><div class="ttdoc">Class to hold a media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d80/media__sample_8h_source.html#l00022">media_sample.h:22</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1MediaSample_html"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">shaka::media::MediaSample</a></div><div class="ttdoc">Class to hold a media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d80/media__sample_8h_source.html#l00021">media_sample.h:21</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_1MediaSample_html_a59e7bbd2ee8cfa1697093d14d16a6c4d"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d">shaka::media::MediaSample::CreateEmptyMediaSample</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CreateEmptyMediaSample()</div><div class="ttdoc">Create a MediaSample object with default members. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00074">media_sample.cc:74</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 da4ef3ae26..73a0d52475 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 72fa0dc167..25d6dec769 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 0c446add32..a2bea659ac 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 390a6bfc19..9fca256cb3 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 32be0ffab4..1f3df96786 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9ea7954f7c..c6f5bc1827 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 5c46a6ed12..7cfa2459fd 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9029d0a336..3201cc7588 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 6b4a515672..12bf7c631a 100644
--- a/docs/d8/d28/es__parser__h265_8h_source.html
+++ b/docs/d8/d28/es__parser__h265_8h_source.html
@@ -99,11 +99,11 @@ 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;stdint.h&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;list&gt;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;utility&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/base/callback.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;utility&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/callback.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.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/es_parser_h26x.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>
@@ -141,7 +141,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  scoped_refptr&lt;StreamInfo&gt; last_video_decoder_config_;</div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">bool</span> decoder_config_check_pending_;</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;  scoped_ptr&lt;H265Parser&gt; h265_parser_;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  std::unique_ptr&lt;H265Parser&gt; h265_parser_;</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;}  <span class="comment">// namespace mp2t</span></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 392246e7c3..3e8e6fa1e1 100644
--- a/docs/d8/d33/webm__content__encodings__client_8h_source.html
+++ b/docs/d8/d33/webm__content__encodings__client_8h_source.html
@@ -94,11 +94,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<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>
@@ -120,7 +120,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;ContentEncoding&gt; cur_content_encoding_;</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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b842e0df1d..d35654e284 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 c35721a19c..c60771d0f1 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9140f34e0b..3da9482801 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 c53af52375..7d595e4b50 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b673b23980..55e8d32aef 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bd4622ee2a..6aa8a0661d 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2c0e640735..d4662cb8d3 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 2d9efba1e7..f8bfe00943 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 2f308ab69b..98911ded5f 100644
--- a/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html
+++ b/docs/d8/d86/classshaka_1_1media_1_1WebMTracksParser.html
@@ -163,7 +163,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 Tracks element. </p>
 
-<p>Definition at line <a class="el" href="../../d6/d7b/webm__tracks__parser_8h_source.html#l00028">28</a> of file <a class="el" href="../../d6/d7b/webm__tracks__parser_8h_source.html">webm_tracks_parser.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d7b/webm__tracks__parser_8h_source.html#l00027">27</a> of file <a class="el" href="../../d6/d7b/webm__tracks__parser_8h_source.html">webm_tracks_parser.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a554135ee3a8ad995beeab868c67aba36"></a>
 <div class="memitem">
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 181fd840e8..4178467d56 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 62c13ff60e..82429af018 100644
--- a/docs/d8/d8e/classshaka_1_1AdaptationSet.html
+++ b/docs/d8/d8e/classshaka_1_1AdaptationSet.html
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 07a2985dc8..fbeac2b3ae 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 9d39865459..1234e27ad1 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 bcfc546610..4215969cb1 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 1b1ce2b486..59b57d560b 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 35f3692f3c..11f6d3abe6 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 08e4de6da4..db5642b6c9 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0ad7c27c18..2001b453aa 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2fcb33bb13..5a4680856c 100644
--- a/docs/d8/d9a/fragmenter_8cc_source.html
+++ b/docs/d8/d9a/fragmenter_8cc_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e6c0d3d907..d683720206 100644
--- a/docs/d8/d9c/webm__tracks__parser_8cc_source.html
+++ b/docs/d8/d9c/webm__tracks__parser_8cc_source.html
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 22ba63bf55..f13d043d3b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 2b10ea636e..2ccf2ad5cf 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ea9a54972f..ac8c65debd 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 dd1ffdea30..3a3ebe20dc 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 6caafced23..85189216db 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b7b6244435..5fed2f8f37 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 76e6be2051..d28f9621c4 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
@@ -107,18 +107,18 @@ Inheritance diagram for shaka::media::mp4::MultiSegmentSegmenter:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a4e1d7a08e4b93c7c46418ead25477e05"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4e1d7a08e4b93c7c46418ead25477e05"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>MultiSegmentSegmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, scoped_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, scoped_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
-<tr class="separator:a4e1d7a08e4b93c7c46418ead25477e05"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae7c44429ca120f939120bc5dbcf53b46"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae7c44429ca120f939120bc5dbcf53b46"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>MultiSegmentSegmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, std::unique_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, std::unique_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
+<tr class="separator:ae7c44429ca120f939120bc5dbcf53b46"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">Segmenter implementation overrides.</div></td></tr>
 <tr class="memitem:a15f78aada048b15472d485b80875e838"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html#a15f78aada048b15472d485b80875e838">GetInitRange</a> (size_t *offset, size_t *size) override</td></tr>
 <tr class="separator:a15f78aada048b15472d485b80875e838"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:acd917150490f8e5721fad28904422eca"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html#acd917150490f8e5721fad28904422eca">GetIndexRange</a> (size_t *offset, size_t *size) override</td></tr>
 <tr class="separator:acd917150490f8e5721fad28904422eca"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter')"><img src="../../closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td></tr>
-<tr class="memitem:adad063c6e53e7193519381226c737ac8 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adad063c6e53e7193519381226c737ac8"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, scoped_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, scoped_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
-<tr class="separator:adad063c6e53e7193519381226c737ac8 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3338fa3d4cfe0f8ed12c2fe16735af58 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3338fa3d4cfe0f8ed12c2fe16735af58"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, std::unique_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, std::unique_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
+<tr class="separator:a3338fa3d4cfe0f8ed12c2fe16735af58 inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0440c751fd818964397d17330acc7afc inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Initialize</a> (const std::vector&lt; <a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a> * &gt; &amp;streams, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td></tr>
 <tr class="separator:a0440c751fd818964397d17330acc7afc inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a464a30159b8888a54254356d191947ac inherit pub_methods_classshaka_1_1media_1_1mp4_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">Finalize</a> ()</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3106f7ea17..043cc506fe 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 d27c826db2..2b15b5dab1 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4d730975ac..b15b73ba24 100644
--- a/docs/d8/dca/ts__writer_8h_source.html
+++ b/docs/d8/dca/ts__writer_8h_source.html
@@ -98,9 +98,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;list&gt;</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;map&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/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/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/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/file/file_closer.h&quot;</span></div>
@@ -125,10 +125,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#ae9979f940d7a07127709576aa1f766a1">FinalizeSegment</a>();</div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">AddPesPacket</a>(scoped_ptr&lt;PesPacket&gt; pes_packet);</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">AddPesPacket</a>(std::unique_ptr&lt;PesPacket&gt; pes_packet);</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">SetProgramMapTableWriterForTesting</a>(</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      scoped_ptr&lt;ProgramMapTableWriter&gt; table_writer);</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">SetProgramMapTableWriterForTesting</a>(</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      std::unique_ptr&lt;ProgramMapTableWriter&gt; table_writer);</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="keyword">private</span>:</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="comment">// True if further segments generated by this instance should be encrypted.</span></div>
@@ -138,9 +138,9 @@ 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="../../d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html">ContinuityCounter</a> pat_continuity_counter_;</div>
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <a class="code" href="../../d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html">ContinuityCounter</a> elementary_stream_continuity_counter_;</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;  scoped_ptr&lt;ProgramMapTableWriter&gt; pmt_writer_;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  std::unique_ptr&lt;ProgramMapTableWriter&gt; pmt_writer_;</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;  scoped_ptr&lt;File, FileCloser&gt; current_file_;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; current_file_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">TsWriter</a>);</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;};</div>
@@ -152,9 +152,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;<span class="preprocessor">#endif  // PACKAGER_MEDIA_FORMATS_MP2T_TS_WRITER_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_1mp2t_1_1TsWriter_html_a9ba30b9cc1e4ae2992735709ae987c64"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a9ba30b9cc1e4ae2992735709ae987c64">shaka::media::mp2t::TsWriter::NewSegment</a></div><div class="ttdeci">virtual bool NewSegment(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00199">ts_writer.cc:199</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a0bead9b328bf6c7c9d5bc6997fea2971"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">shaka::media::mp2t::TsWriter::SetProgramMapTableWriterForTesting</a></div><div class="ttdeci">void SetProgramMapTableWriterForTesting(scoped_ptr&lt; ProgramMapTableWriter &gt; table_writer)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00250">ts_writer.cc:250</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a19a7699df7ac129aedfdff074a8a18a3"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">shaka::media::mp2t::TsWriter::AddPesPacket</a></div><div class="ttdeci">virtual bool AddPesPacket(std::unique_ptr&lt; PesPacket &gt; pes_packet)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00238">ts_writer.cc:238</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1ContinuityCounter_html"><div class="ttname"><a href="../../d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html">shaka::media::mp2t::ContinuityCounter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d3/d62/continuity__counter_8h_source.html#l00016">continuity_counter.h:16</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a8b2b5caa68f34a332a377524a5f23e61"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">shaka::media::mp2t::TsWriter::AddPesPacket</a></div><div class="ttdeci">virtual bool AddPesPacket(scoped_ptr&lt; PesPacket &gt; pes_packet)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00238">ts_writer.cc:238</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a6eeeadf8e60dc09378b5df7c62eb2bf0"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">shaka::media::mp2t::TsWriter::SetProgramMapTableWriterForTesting</a></div><div class="ttdeci">void SetProgramMapTableWriterForTesting(std::unique_ptr&lt; ProgramMapTableWriter &gt; table_writer)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00250">ts_writer.cc:250</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">shaka::media::mp2t::TsWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d8/dca/ts__writer_8h_source.html#l00028">ts_writer.h:28</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_ae9979f940d7a07127709576aa1f766a1"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#ae9979f940d7a07127709576aa1f766a1">shaka::media::mp2t::TsWriter::FinalizeSegment</a></div><div class="ttdeci">virtual bool FinalizeSegment()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00234">ts_writer.cc:234</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a6bee605be771538f78633e2ecfc979c6"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6">shaka::media::mp2t::TsWriter::Initialize</a></div><div class="ttdeci">virtual bool Initialize(const StreamInfo &amp;stream_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00165">ts_writer.cc:165</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 91a28a4015..baf1371176 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 67e2d7ad20..720ad15e24 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 f6df4418c0..d524fd49b6 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a4d4039fbb..c764eb7f48 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 83a065dbbc..d47dcf2990 100644
--- a/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html
+++ b/docs/d8/de1/classshaka_1_1SimpleMpdNotifier.html
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 bbbff455a8..4dd0f08df8 100644
--- a/docs/d8/de6/webm__crypto__helpers_8h_source.html
+++ b/docs/d8/de6/webm__crypto__helpers_8h_source.html
@@ -95,28 +95,27 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/decrypt_config.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="l00024"></a><span class="lineno">   24</span>&#160;<span class="keywordtype">bool</span> WebMCreateDecryptConfig(<span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                             <span class="keywordtype">int</span> data_size,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                             <span class="keyword">const</span> uint8_t* key_id,</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                             <span class="keywordtype">int</span> key_id_size,</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                             scoped_ptr&lt;DecryptConfig&gt;* decrypt_config,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                             <span class="keywordtype">int</span>* data_offset);</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">// namespace media</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/decrypt_config.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="l00023"></a><span class="lineno">   23</span>&#160;<span class="keywordtype">bool</span> WebMCreateDecryptConfig(<span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;                             <span class="keywordtype">int</span> data_size,</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;                             <span class="keyword">const</span> uint8_t* key_id,</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                             <span class="keywordtype">int</span> key_id_size,</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                             std::unique_ptr&lt;DecryptConfig&gt;* decrypt_config,</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                             <span class="keywordtype">int</span>* data_offset);</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="comment">// namespace media</span></div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;}  <span class="comment">// namespace shaka</span></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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 597c76eed7..8334b50118 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 d21ace8c3c..650abef427 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ffb3fe8f70..2cb6b1f8b0 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 6e1a92d54f..f1fdb7ecbb 100644
--- a/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html
+++ b/docs/d8/df0/webm_2single__segment__segmenter_8cc_source.html
@@ -107,8 +107,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;SingleSegmentSegmenter::~SingleSegmentSegmenter() {}</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;Status SingleSegmentSegmenter::DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  writer_ = writer.Pass();</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;Status SingleSegmentSegmenter::DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) {</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  writer_ = std::move(writer);</div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  Status ret = WriteSegmentHeader(0, writer_.get());</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  init_end_ = writer_-&gt;Position() - 1;</div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  seek_head()-&gt;set_cluster_pos(init_end_ + 1 - segment_payload_pos());</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 ffc75d09a3..be2f6ba827 100644
--- a/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html
+++ b/docs/d8/df7/classshaka_1_1media_1_1SegmentTestBase-members.html
@@ -93,7 +93,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a>, including all inherited members.</p>
 <table class="directory">
-  <tr class="even"><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">CreateAndInitializeSegmenter</a>(const MuxerOptions &amp;options, StreamInfo *info, KeySource *key_source, scoped_ptr&lt; webm::Segmenter &gt; *result) const </td><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">CreateAndInitializeSegmenter</a>(const MuxerOptions &amp;options, StreamInfo *info, KeySource *key_source, std::unique_ptr&lt; webm::Segmenter &gt; *result) const </td><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">CreateMuxerOptions</a>() const </td><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed">CreateSample</a>(KeyFrameFlag key_frame_flag, uint64_t duration, SideDataFlag side_data_flag)</td><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a7e34fd92e43914bd2f032835cdc9b8a7">CreateVideoStreamInfo</a>() const </td><td class="entry"><a class="el" href="../../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html">shaka::media::SegmentTestBase</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 26cca81614..074855d1d1 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 40384aea60..51f83e3d7e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 94d6341819..c946b04f61 100644
--- a/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html
+++ b/docs/d9/d01/mp4_2single__segment__segmenter_8h_source.html
@@ -106,8 +106,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">Segmenter</a> {</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160; <span class="keyword">public</span>:</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <a class="code" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options,</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                         scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                         scoped_ptr&lt;Movie&gt; moov);</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                         std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                         std::unique_ptr&lt;Movie&gt; moov);</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  ~<a class="code" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a>() <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="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html#a61e71cfc720342ecb16b830e6fca0fe4">GetInitRange</a>(<span class="keywordtype">size_t</span>* offset, <span class="keywordtype">size_t</span>* size) <span class="keyword">override</span>;</div>
@@ -119,9 +119,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</span>;</div>
 <div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalizeSegment() <span class="keyword">override</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;  scoped_ptr&lt;SegmentIndex&gt; vod_sidx_;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  std::unique_ptr&lt;SegmentIndex&gt; vod_sidx_;</div>
 <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  std::string temp_file_name_;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; temp_file_;</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; temp_file_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a>);</div>
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;};</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4c99dc9cd2..d219ff134c 100644
--- a/docs/d9/d08/mock__mpd__builder_8h_source.html
+++ b/docs/d9/d08/mock__mpd__builder_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d8d70197ca..2038392c59 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 82b8c80293..286871e394 100644
--- a/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html
+++ b/docs/d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f8a221b2a4..4cde838ea8 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 4f43cc7c92..bad21e54e1 100644
--- a/docs/d9/d15/key__rotation__fragmenter_8cc_source.html
+++ b/docs/d9/d15/key__rotation__fragmenter_8cc_source.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                                             <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener)</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    : <a class="code" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">EncryptingFragmenter</a>(info,</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                           traf,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                           scoped_ptr&lt;<a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>&gt;(new <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>()),</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                           std::unique_ptr&lt;<a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>&gt;(new <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>()),</div>
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                           clear_time,</div>
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                           protection_scheme,</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;                           crypt_byte_block,</div>
@@ -144,7 +144,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  int64_t current_crypto_period_index =</div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;      traf()-&gt;decode_time.decode_time / crypto_period_duration_;</div>
 <div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordflow">if</span> (current_crypto_period_index != prev_crypto_period_index_) {</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    scoped_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    std::unique_ptr&lt;EncryptionKey&gt; encryption_key(<span class="keyword">new</span> <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>());</div>
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = encryption_key_source_-&gt;<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16">GetCryptoPeriodKey</a>(</div>
 <div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        current_crypto_period_index, track_type_, encryption_key.get());</div>
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
@@ -155,7 +155,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;        <span class="keywordflow">return</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Failed to generate random iv.&quot;</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">   69</span>&#160;    set_encryption_key(encryption_key.Pass());</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    set_encryption_key(std::move(encryption_key));</div>
 <div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    prev_crypto_period_index_ = current_crypto_period_index;</div>
 <div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    need_to_refresh_encryptor = <span class="keyword">true</span>;</div>
 <div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  }</div>
@@ -230,21 +230,21 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1TrackFragment_html"><div class="ttname"><a href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">shaka::media::mp4::TrackFragment</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00728">box_definitions.h:728</a></div></div>
 <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#l00020">key_source.h:20</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="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>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry_html"><div class="ttname"><a href="../../d8/dd6/structshaka_1_1media_1_1mp4_1_1CencSampleEncryptionInfoEntry.html">shaka::media::mp4::CencSampleEncryptionInfoEntry</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00479">box_definitions.h:479</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00204">encrypting_fragmenter.cc:204</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter_html_a4220479b2dd98b462ff4dd4afcf56d0e"><div class="ttname"><a href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e">shaka::media::mp4::EncryptingFragmenter::CreateEncryptor</a></div><div class="ttdeci">Status CreateEncryptor()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00208">encrypting_fragmenter.cc:208</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1SampleGroupDescription_html"><div class="ttname"><a href="../../d7/d01/structshaka_1_1media_1_1mp4_1_1SampleGroupDescription.html">shaka::media::mp4::SampleGroupDescription</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00508">box_definitions.h:508</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#l00031">key_source.h:31</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_1KeyRotationFragmenter_html_a3bdb3a237cb8eb1484ee98e195d290a7"><div class="ttname"><a href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html#a3bdb3a237cb8eb1484ee98e195d290a7">shaka::media::mp4::KeyRotationFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">Status PrepareFragmentForEncryption(bool enable_encryption) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d15/key__rotation__fragmenter_8cc_source.html#l00051">key_rotation_fragmenter.cc:51</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 a4c74ae897..d07d819cae 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 12b9f1c836..86d39a8174 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d7630bb99e..7f1119e94e 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
@@ -109,9 +109,9 @@ Inheritance diagram for shaka::media::mp4::Segmenter:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:adad063c6e53e7193519381226c737ac8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adad063c6e53e7193519381226c737ac8"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, scoped_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, scoped_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
-<tr class="separator:adad063c6e53e7193519381226c737ac8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3338fa3d4cfe0f8ed12c2fe16735af58"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3338fa3d4cfe0f8ed12c2fe16735af58"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options, std::unique_ptr&lt; <a class="el" href="../../d5/d03/structshaka_1_1media_1_1mp4_1_1FileType.html">FileType</a> &gt; ftyp, std::unique_ptr&lt; <a class="el" href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">Movie</a> &gt; moov)</td></tr>
+<tr class="separator:a3338fa3d4cfe0f8ed12c2fe16735af58"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0440c751fd818964397d17330acc7afc"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Initialize</a> (const std::vector&lt; <a class="el" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a> * &gt; &amp;streams, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td></tr>
 <tr class="separator:a0440c751fd818964397d17330acc7afc"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a464a30159b8888a54254356d191947ac"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">Finalize</a> ()</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 967c98c8e4..1d62a5b883 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 5fea4097fb..15cb1168cf 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 f0a2a286fb..562e1f003f 100644
--- a/docs/d9/d3b/webm__content__encodings_8h_source.html
+++ b/docs/d9/d3b/webm__content__encodings_8h_source.html
@@ -95,91 +95,90 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;stdint.h&gt;</span></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;</div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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"><a class="line" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">   16</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a> {</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160; <span class="keyword">public</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"><a class="line" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">   21</a></span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">kOrderInvalid</a> = -1;</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">enum</span> Scope {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    kScopeInvalid = 0,</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    kScopeAllFrameContents = 1,</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    kScopeTrackPrivateData = 2,</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    kScopeNextContentEncodingData = 4,</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    kScopeMax = 7,</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;  <span class="keyword">enum</span> Type {</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    kTypeInvalid = -1,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    kTypeCompression = 0,</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    kTypeEncryption = 1,</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="keyword">enum</span> EncryptionAlgo {</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    kEncAlgoInvalid = -1,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    kEncAlgoNotEncrypted = 0,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    kEncAlgoDes = 1,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    kEncAlgo3des = 2,</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    kEncAlgoTwofish = 3,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    kEncAlgoBlowfish = 4,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    kEncAlgoAes = 5,</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="keyword">enum</span> CipherMode {</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    kCipherModeInvalid = 0,</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    kCipherModeCtr = 1,</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;  ContentEncoding();</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  ~ContentEncoding();</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;  int64_t order()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> order_; }</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">void</span> set_order(int64_t order) { order_ = order; }</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;  Scope scope()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> scope_; }</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> set_scope(Scope scope) { scope_ = scope; }</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;  Type type()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> type_; }</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">void</span> set_type(Type type) { type_ = 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;  EncryptionAlgo encryption_algo()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> encryption_algo_; }</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">void</span> set_encryption_algo(EncryptionAlgo encryption_algo) {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    encryption_algo_ = encryption_algo;</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;  <span class="keyword">const</span> std::string&amp; encryption_key_id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> encryption_key_id_; }</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="keywordtype">void</span> SetEncryptionKeyId(<span class="keyword">const</span> uint8_t* encryption_key_id, <span class="keywordtype">int</span> size);</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;  CipherMode cipher_mode()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> cipher_mode_; }</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keywordtype">void</span> set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }</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">private</span>:</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  int64_t order_;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  Scope scope_;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  Type type_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  EncryptionAlgo encryption_algo_;</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  std::string encryption_key_id_;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  CipherMode cipher_mode_;</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;  DISALLOW_COPY_AND_ASSIGN(ContentEncoding);</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">   86</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_</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#l00016">webm_content_encodings.h:16</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#l00021">webm_content_encodings.h:21</a></div></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;string&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="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"><a class="line" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">   15</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a> {</div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160; <span class="keyword">public</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"><a class="line" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">   20</a></span>&#160;  <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> <a class="code" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html#a3ba32d5ca8b0688b2dc6b2ec8a5be6d2">kOrderInvalid</a> = -1;</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">enum</span> Scope {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    kScopeInvalid = 0,</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;    kScopeAllFrameContents = 1,</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    kScopeTrackPrivateData = 2,</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;    kScopeNextContentEncodingData = 4,</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    kScopeMax = 7,</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;</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <span class="keyword">enum</span> Type {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    kTypeInvalid = -1,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    kTypeCompression = 0,</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    kTypeEncryption = 1,</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">   36</span>&#160;  <span class="keyword">enum</span> EncryptionAlgo {</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    kEncAlgoInvalid = -1,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    kEncAlgoNotEncrypted = 0,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    kEncAlgoDes = 1,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    kEncAlgo3des = 2,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;    kEncAlgoTwofish = 3,</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    kEncAlgoBlowfish = 4,</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    kEncAlgoAes = 5,</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="keyword">enum</span> CipherMode {</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    kCipherModeInvalid = 0,</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    kCipherModeCtr = 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">   51</span>&#160;  ContentEncoding();</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  ~ContentEncoding();</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;  int64_t order()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> order_; }</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">void</span> set_order(int64_t order) { order_ = order; }</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;  Scope scope()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> scope_; }</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="keywordtype">void</span> set_scope(Scope scope) { scope_ = scope; }</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;  Type type()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> type_; }</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">void</span> set_type(Type type) { type_ = type; }</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;  EncryptionAlgo encryption_algo()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> encryption_algo_; }</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">void</span> set_encryption_algo(EncryptionAlgo encryption_algo) {</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    encryption_algo_ = encryption_algo;</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="keyword">const</span> std::string&amp; encryption_key_id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> encryption_key_id_; }</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="keywordtype">void</span> SetEncryptionKeyId(<span class="keyword">const</span> uint8_t* encryption_key_id, <span class="keywordtype">int</span> size);</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;  CipherMode cipher_mode()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> cipher_mode_; }</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">void</span> set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }</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;  int64_t order_;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  Scope scope_;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  Type type_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  EncryptionAlgo encryption_algo_;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  std::string encryption_key_id_;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  CipherMode cipher_mode_;</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;  DISALLOW_COPY_AND_ASSIGN(ContentEncoding);</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">// namespace media</span></div>
+<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  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 c45e772c99..a23e71b6ef 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 3ea33a332a..7a1ae88597 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 7ff4b0c54a..01ab3a33f3 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ed4cbd9782..b359ecc075 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 62df4d1fb7..a9ea31b151 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3bf4287b9a..8fe48229aa 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 7236577c67..e42425e3f7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 092a7cf3cd..7f5bf3be11 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ad7604b293..48afc0a623 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 389ea5dacb..02c0d0d593 100644
--- a/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html
+++ b/docs/d9/d87/classshaka_1_1media_1_1WebMContentEncodingsClient.html
@@ -152,7 +152,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 761dc98526..49c0738d00 100644
--- a/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html
+++ b/docs/d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html
@@ -135,7 +135,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html" title="AesRequestSigner uses AES-CBC signing. ">AesRequestSigner</a> uses AES-CBC signing. </p>
 
-<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00043">43</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00044">44</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a43f4cc9fad9901fa905805be81f7d58c"></a>
 <div class="memitem">
@@ -188,7 +188,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9db5fad579..7d7018f730 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 a2efbf4bfa..9a353c886b 100644
--- a/docs/d9/d90/text__track_8h_source.html
+++ b/docs/d9/d90/text__track_8h_source.html
@@ -94,10 +94,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#ifndef MEDIA_BASE_TEXT_TRACK_H_</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_TEXT_TRACK_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;string&gt;</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="preprocessor">#include &quot;packager/base/callback.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></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;</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/time/time.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>
@@ -121,10 +121,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                            <span class="keyword">const</span> std::string&amp; settings) = 0;</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">   36</span>&#160;<span class="keyword">typedef</span> base::Callback&lt;scoped_ptr&lt;TextTrack&gt;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    (TextKind kind,</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;     <span class="keyword">const</span> std::string&amp; label,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;     <span class="keyword">const</span> std::string&amp; language)&gt; AddTextTrackCB;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="keyword">typedef</span> base::Callback&lt;std::unique_ptr&lt;TextTrack&gt;(TextKind kind,</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;                                                  <span class="keyword">const</span> std::string&amp; label,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                                                  <span class="keyword">const</span> std::string&amp; language)&gt;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    AddTextTrackCB;</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 media</span></div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;}  <span class="comment">// namespace shaka</span></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1109688739..ec8b5a2d59 100644
--- a/docs/d9/d93/media__stream_8h_source.html
+++ b/docs/d9/d93/media__stream_8h_source.html
@@ -97,9 +97,9 @@ 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_MEDIA_STREAM_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;deque&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/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</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/memory/ref_counted.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/status.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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 88a5ebcc7c..5409638b03 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 faeec53d6b..831091e13c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9a313d1c28..b06b412761 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 236b706349..fa7f734eea 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
@@ -107,7 +107,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>progress_target</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#aeed8f5be9d9d7266afd017e0e5692d8d">sample_duration</a>() const </td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, scoped_ptr&lt; FileType &gt; ftyp, scoped_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, std::unique_ptr&lt; FileType &gt; ftyp, std::unique_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>set_progress_target</b>(uint64_t progress_target) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">SetComplete</a>()</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>sidx</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ece14047f9..f7febe7d39 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0a6eb64819..15751cd3d8 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 86b0b7431d..cc3ebf2bfc 100644
--- a/docs/d9/db9/muxer_8cc_source.html
+++ b/docs/d9/db9/muxer_8cc_source.html
@@ -95,130 +95,132 @@ 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/muxer.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/media/base/fourccs.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/media_stream.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;Muxer::Muxer(<span class="keyword">const</span> MuxerOptions&amp; options)</div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;    : options_(options),</div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;      initialized_(false),</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;      encryption_key_source_(NULL),</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;      max_sd_pixels_(0),</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;      clear_lead_in_seconds_(0),</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      crypto_period_duration_in_seconds_(0),</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;      protection_scheme_(FOURCC_NULL),</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;      cancelled_(false),</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      clock_(NULL) {}</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;Muxer::~Muxer() {}</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;</div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/fourccs.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/media_sample.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_stream.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;Muxer::Muxer(<span class="keyword">const</span> MuxerOptions&amp; options)</div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;    : options_(options),</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;      initialized_(false),</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;      encryption_key_source_(NULL),</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      max_sd_pixels_(0),</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;      clear_lead_in_seconds_(0),</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;      crypto_period_duration_in_seconds_(0),</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      protection_scheme_(FOURCC_NULL),</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;      cancelled_(false),</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;      clock_(NULL) {}</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">   29</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">Muxer::SetKeySource</a>(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* encryption_key_source,</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                         uint32_t max_sd_pixels,</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                         <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                         <span class="keywordtype">double</span> crypto_period_duration_in_seconds,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                         FourCC protection_scheme) {</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  DCHECK(encryption_key_source);</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  encryption_key_source_ = encryption_key_source;</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  max_sd_pixels_ = max_sd_pixels;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  clear_lead_in_seconds_ = clear_lead_in_seconds;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  crypto_period_duration_in_seconds_ = crypto_period_duration_in_seconds;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  protection_scheme_ = protection_scheme;</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">   42</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">Muxer::AddStream</a>(<a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>* stream) {</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  DCHECK(stream);</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  stream-&gt;<a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#a98e53e299c7258419623b3d709553562">Connect</a>(<span class="keyword">this</span>);</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  streams_.push_back(stream);</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">   48</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Muxer::Run</a>() {</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  DCHECK(!streams_.empty());</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;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// Start the streams.</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;MediaStream*&gt;::iterator it = streams_.begin();</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;       it != streams_.end();</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;       ++it) {</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    status = (*it)-&gt;Start(MediaStream::kPull);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;      <span class="keywordflow">return</span> status;</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;  uint32_t current_stream_id = 0;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordflow">while</span> (status.ok()) {</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordflow">if</span> (cancelled_)</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::CANCELLED, <span class="stringliteral">&quot;muxer run cancelled&quot;</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;    scoped_refptr&lt;MediaSample&gt; sample;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    status = streams_[current_stream_id]-&gt;PullSample(&amp;sample);</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;      <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    status = AddSample(streams_[current_stream_id], sample);</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="comment">// Switch to next stream if the current stream is ready for fragmentation.</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">if</span> (status.error_code() == error::FRAGMENT_FINALIZED) {</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;      current_stream_id = (current_stream_id + 1) % streams_.size();</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;      status.Clear();</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="comment">// Finalize the muxer after reaching end of stream.</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <span class="keywordflow">return</span> status.error_code() == error::END_OF_STREAM ? Finalize() : status;</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">   82</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Muxer::Cancel</a>() {</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  cancelled_ = <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="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">   86</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">Muxer::SetMuxerListener</a>(scoped_ptr&lt;MuxerListener&gt; muxer_listener) {</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  muxer_listener_ = muxer_listener.Pass();</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;</div>
-<div class="line"><a name="l00090"></a><span class="lineno"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">   90</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">Muxer::SetProgressListener</a>(</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    scoped_ptr&lt;ProgressListener&gt; progress_listener) {</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  progress_listener_ = progress_listener.Pass();</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;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> Muxer::AddSample(<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="l00096"></a><span class="lineno">   96</span>&#160;                        scoped_refptr&lt;MediaSample&gt; sample) {</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  DCHECK(std::find(streams_.begin(), streams_.end(), stream) != streams_.end());</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="keywordflow">if</span> (!initialized_) {</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = Initialize();</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;      <span class="keywordflow">return</span> status;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    initialized_ = <span class="keyword">true</span>;</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="keywordflow">if</span> (sample-&gt;end_of_stream()) {</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    <span class="comment">// EOS sample should be sent only when the sample was pushed from Demuxer</span></div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    <span class="comment">// to Muxer. In this case, there should be only one stream in Muxer.</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    DCHECK_EQ(1u, streams_.size());</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keywordflow">return</span> Finalize();</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sample-&gt;is_encrypted()) {</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unable to multiplex encrypted media sample&quot;</span>;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Encrypted media sample.&quot;</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="keywordflow">return</span> DoAddSample(stream, sample);</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a9204fe352d13cea8a367ae9c14e9639e"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">shaka::media::Muxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00082">muxer.cc:82</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a0a2dfb3924ce1307f98c339e6587369c"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">shaka::media::Muxer::SetProgressListener</a></div><div class="ttdeci">void SetProgressListener(scoped_ptr&lt; ProgressListener &gt; progress_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00090">muxer.cc:90</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a786fbb91d7ece58c68334f5cef16ae71"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">shaka::media::Muxer::SetMuxerListener</a></div><div class="ttdeci">void SetMuxerListener(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00086">muxer.cc:86</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_ad9479d299d1c494604a5f5a052fe8280"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">shaka::media::Muxer::AddStream</a></div><div class="ttdeci">void AddStream(MediaStream *stream)</div><div class="ttdoc">Add video/audio stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00042">muxer.cc:42</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a021fdae2adc98716b1c8ee7617ab917b"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(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="../../d9/db9/muxer_8cc_source.html#l00029">muxer.cc:29</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_adc96fbcd6a4d4ba9845f8d00974ace0f"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">shaka::media::Muxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdoc">Drive the remuxing from muxer side (pull). </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00048">muxer.cc:48</a></div></div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;Muxer::~Muxer() {}</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/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">   31</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">Muxer::SetKeySource</a>(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* encryption_key_source,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                         uint32_t max_sd_pixels,</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;                         <span class="keywordtype">double</span> clear_lead_in_seconds,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                         <span class="keywordtype">double</span> crypto_period_duration_in_seconds,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                         FourCC protection_scheme) {</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  DCHECK(encryption_key_source);</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  encryption_key_source_ = encryption_key_source;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  max_sd_pixels_ = max_sd_pixels;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  clear_lead_in_seconds_ = clear_lead_in_seconds;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  crypto_period_duration_in_seconds_ = crypto_period_duration_in_seconds;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  protection_scheme_ = protection_scheme;</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">   44</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">Muxer::AddStream</a>(<a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html">MediaStream</a>* stream) {</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  DCHECK(stream);</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  stream-&gt;<a class="code" href="../../d8/d5c/classshaka_1_1media_1_1MediaStream.html#a98e53e299c7258419623b3d709553562">Connect</a>(<span class="keyword">this</span>);</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  streams_.push_back(stream);</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="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">   50</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Muxer::Run</a>() {</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  DCHECK(!streams_.empty());</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;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// Start the streams.</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordflow">for</span> (std::vector&lt;MediaStream*&gt;::iterator it = streams_.begin();</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;       it != streams_.end();</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;       ++it) {</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    status = (*it)-&gt;Start(MediaStream::kPull);</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;      <span class="keywordflow">return</span> status;</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;  uint32_t current_stream_id = 0;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordflow">while</span> (status.ok()) {</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    <span class="keywordflow">if</span> (cancelled_)</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</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;muxer run cancelled&quot;</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;    scoped_refptr&lt;MediaSample&gt; sample;</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    status = streams_[current_stream_id]-&gt;PullSample(&amp;sample);</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;      <span class="keywordflow">break</span>;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    status = AddSample(streams_[current_stream_id], sample);</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">// Switch to next stream if the current stream is ready for fragmentation.</span></div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    <span class="keywordflow">if</span> (status.error_code() == error::FRAGMENT_FINALIZED) {</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;      current_stream_id = (current_stream_id + 1) % streams_.size();</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;      status.Clear();</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="comment">// Finalize the muxer after reaching end of stream.</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">return</span> status.error_code() == error::END_OF_STREAM ? Finalize() : status;</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"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">   84</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Muxer::Cancel</a>() {</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  cancelled_ = <span class="keyword">true</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;</div>
+<div class="line"><a name="l00088"></a><span class="lineno"><a class="line" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">   88</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">Muxer::SetMuxerListener</a>(std::unique_ptr&lt;MuxerListener&gt; muxer_listener) {</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  muxer_listener_ = std::move(muxer_listener);</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="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">   92</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">Muxer::SetProgressListener</a>(</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    std::unique_ptr&lt;ProgressListener&gt; progress_listener) {</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  progress_listener_ = std::move(progress_listener);</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;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> Muxer::AddSample(<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="l00098"></a><span class="lineno">   98</span>&#160;                        scoped_refptr&lt;MediaSample&gt; sample) {</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  DCHECK(std::find(streams_.begin(), streams_.end(), stream) != streams_.end());</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">if</span> (!initialized_) {</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> status = Initialize();</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    <span class="keywordflow">if</span> (!status.ok())</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;      <span class="keywordflow">return</span> status;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    initialized_ = <span class="keyword">true</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;  <span class="keywordflow">if</span> (sample-&gt;end_of_stream()) {</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    <span class="comment">// EOS sample should be sent only when the sample was pushed from Demuxer</span></div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="comment">// to Muxer. In this case, there should be only one stream in Muxer.</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    DCHECK_EQ(1u, streams_.size());</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="keywordflow">return</span> Finalize();</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (sample-&gt;is_encrypted()) {</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Unable to multiplex encrypted media sample&quot;</span>;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <span class="keywordflow">return</span> Status(error::INTERNAL_ERROR, <span class="stringliteral">&quot;Encrypted media sample.&quot;</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="keywordflow">return</span> DoAddSample(stream, sample);</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">// namespace media</span></div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a9204fe352d13cea8a367ae9c14e9639e"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">shaka::media::Muxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00084">muxer.cc:84</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_ad9479d299d1c494604a5f5a052fe8280"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">shaka::media::Muxer::AddStream</a></div><div class="ttdeci">void AddStream(MediaStream *stream)</div><div class="ttdoc">Add video/audio stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00044">muxer.cc:44</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a021fdae2adc98716b1c8ee7617ab917b"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(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="../../d9/db9/muxer_8cc_source.html#l00031">muxer.cc:31</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_adc96fbcd6a4d4ba9845f8d00974ace0f"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">shaka::media::Muxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdoc">Drive the remuxing from muxer side (pull). </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00050">muxer.cc:50</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_1Muxer_html_a25a146d553c385aad70dbff6b3e87eec"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">shaka::media::Muxer::SetProgressListener</a></div><div class="ttdeci">void SetProgressListener(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00092">muxer.cc:92</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#l00031">key_source.h:31</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_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_1Muxer_html_a0e76dd0a5c07dd538221459365ae824a"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">shaka::media::Muxer::SetMuxerListener</a></div><div class="ttdeci">void SetMuxerListener(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00088">muxer.cc:88</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 1b3783fee2..df0fdc984f 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 02c06689e3..792cc18730 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ffe7498206..4203d2c7b1 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a481c129d0..505b445170 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 cc14e5248b..e7d56ef5db 100644
--- a/docs/d9/dcc/webm__video__client_8h_source.html
+++ b/docs/d9/dcc/webm__video__client_8h_source.html
@@ -94,10 +94,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
-<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/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></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 &quot;packager/media/base/video_stream_info.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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 e1063742ae..b9bf2e02e0 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 1e9325c7d8..07c4956d55 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 67263350b2..4ef50fb506 100644
--- a/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html
+++ b/docs/d9/dea/classshaka_1_1media_1_1FixedKeySource-members.html
@@ -93,7 +93,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a>, including all inherited members.</p>
 <table class="directory">
-  <tr class="even"><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">CreateFromHexStrings</a>(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)</td><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">CreateFromHexStrings</a>(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)</td><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a358b0955ecec61e6ce23611e2772265b">FetchKeys</a>(const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</td><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#aab2d8d84067ae5e778e3c242fec6dcb1">FetchKeys</a>(const std::vector&lt; std::vector&lt; uint8_t &gt;&gt; &amp;key_ids) override</td><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a4dd894ee7e68340771d34bb81dce0ae5">FetchKeys</a>(uint32_t asset_id) override</td><td class="entry"><a class="el" href="../../d0/dac/classshaka_1_1media_1_1FixedKeySource.html">shaka::media::FixedKeySource</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 7421f1a989..0bf511dd5e 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6bffccdbb4..8d48b966af 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 d086ad7de0..f71d36c1c3 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 99b8f8400c..eb5d2bbceb 100644
--- a/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html
+++ b/docs/d9/dff/structshaka_1_1media_1_1H264ModificationOfPicNum.html
@@ -119,7 +119,7 @@ union {</td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b9cb1a44a6..ddf9785c39 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 0a2d31beb3..ce39655bee 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 78942b4a73..d5cbaf0594 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 6f5ee35514..e236f4cd54 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 01b3d3443d..217dbda8d4 100644
--- a/docs/da/d22/key__rotation__fragmenter_8h_source.html
+++ b/docs/da/d22/key__rotation__fragmenter_8h_source.html
@@ -149,14 +149,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
-<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#l00031">key_source.h:31</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_1KeyRotationFragmenter_html"><div class="ttname"><a href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html">shaka::media::mp4::KeyRotationFragmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../da/d22/key__rotation__fragmenter_8h_source.html#l00023">key_rotation_fragmenter.h:23</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter_html_a3bdb3a237cb8eb1484ee98e195d290a7"><div class="ttname"><a href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html#a3bdb3a237cb8eb1484ee98e195d290a7">shaka::media::mp4::KeyRotationFragmenter::PrepareFragmentForEncryption</a></div><div class="ttdeci">Status PrepareFragmentForEncryption(bool enable_encryption) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/d15/key__rotation__fragmenter_8cc_source.html#l00051">key_rotation_fragmenter.cc:51</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 1eaf363933..e5b85503b0 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
@@ -109,9 +109,9 @@ Inheritance diagram for shaka::media::mp2t::EsParserH26x:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a1ad0d1d76943970a6e16f3d95b732798"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1ad0d1d76943970a6e16f3d95b732798"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, scoped_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
-<tr class="separator:a1ad0d1d76943970a6e16f3d95b732798"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2f10c5ee6ede293c7e53056d806533f5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2f10c5ee6ede293c7e53056d806533f5"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>EsParserH26x</b> (Nalu::CodecType type, std::unique_ptr&lt; <a class="el" href="../../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html">H26xByteToUnitStreamConverter</a> &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb)</td></tr>
+<tr class="separator:a2f10c5ee6ede293c7e53056d806533f5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac0fdc73889cbc5d3a83cc7cff29259b8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac0fdc73889cbc5d3a83cc7cff29259b8"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>Parse</b> (const uint8_t *buf, int size, int64_t pts, int64_t dts) override</td></tr>
 <tr class="separator:ac0fdc73889cbc5d3a83cc7cff29259b8"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -159,7 +159,7 @@ const scoped_refptr<br class="typebreak"/>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a08cd4abe5..37d8d1db53 100644
--- a/docs/da/d23/ts__muxer_8h_source.html
+++ b/docs/da/d23/ts__muxer_8h_source.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">void</span> FireOnMediaStartEvent();</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">void</span> FireOnMediaEndEvent();</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;  scoped_ptr&lt;TsSegmenter&gt; segmenter_;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  std::unique_ptr&lt;TsSegmenter&gt; segmenter_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d71/classshaka_1_1media_1_1mp2t_1_1TsMuxer.html">TsMuxer</a>);</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;};</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 7532511cf2..9f065d7db4 100644
--- a/docs/da/d24/h265__parser_8h_source.html
+++ b/docs/da/d24/h265__parser_8h_source.html
@@ -97,9 +97,9 @@ 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_CODECS_H265_PARSER_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/base/memory/scoped_ptr.h&quot;</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;<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/codecs/h26x_bit_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="keyword">namespace </span>shaka {</div>
@@ -450,7 +450,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 7940dabbd5..7e73e64adf 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9922926457..b765c89308 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
@@ -108,8 +108,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Run</a>()</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68">set_clock</a>(base::Clock *clock)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">SetKeySource</a>(KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a>(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a>(scoped_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a>(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a>(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>streams</b>() const  (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html#a17b47db217334b2ec328bdbf1a9c7e29">WebMMuxer</a>(const MuxerOptions &amp;options)</td><td class="entry"><a class="el" href="../../d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html">shaka::media::webm::WebMMuxer</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~Muxer</b>() (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 49ac56914c..9827bd870c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 13e966e7a8..b65f4927c1 100644
--- a/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html
+++ b/docs/da/d41/mp4_2multi__segment__segmenter_8h_source.html
@@ -107,8 +107,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">Segmenter</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="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options,</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                        scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                        scoped_ptr&lt;Movie&gt; moov);</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;                        std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                        std::unique_ptr&lt;Movie&gt; moov);</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  ~<a class="code" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>() <span class="keyword">override</span>;</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
 <div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html#a15f78aada048b15472d485b80875e838">GetInitRange</a>(<span class="keywordtype">size_t</span>* offset, <span class="keywordtype">size_t</span>* size) <span class="keyword">override</span>;</div>
@@ -123,7 +123,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="comment">// Write segment to file.</span></div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> WriteSegment();</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;  scoped_ptr&lt;SegmentType&gt; styp_;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  std::unique_ptr&lt;SegmentType&gt; styp_;</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  uint32_t num_segments_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>);</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 c92b4914ea..459e1a864e 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d4c7ff085d..836755b4ea 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1bb768d765..329a726849 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 8b699a1ece..1cdbc204e2 100644
--- a/docs/da/d53/es__parser__h265_8cc_source.html
+++ b/docs/da/d53/es__parser__h265_8cc_source.html
@@ -115,7 +115,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;                           <span class="keyword">const</span> NewStreamInfoCB&amp; new_stream_info_cb,</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;                           <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb)</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;    : EsParserH26x(Nalu::kH265,</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                   scoped_ptr&lt;H26xByteToUnitStreamConverter&gt;(</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                   std::unique_ptr&lt;H26xByteToUnitStreamConverter&gt;(</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                       new H265ByteToUnitStreamConverter()),</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                   pid,</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;                   emit_sample_cb),</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e7ae283fb7..86f2345e25 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 6836016de6..89af823ae4 100644
--- a/docs/da/d5c/widevine__key__source_8h_source.html
+++ b/docs/da/d5c/widevine__key__source_8h_source.html
@@ -97,133 +97,132 @@ 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_WIDEVINE_KEY_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;</div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/synchronization/waitable_event.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/values.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/closure_thread.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="l00021"></a><span class="lineno">   21</span>&#160;<span class="keyword">const</span> uint8_t kWidevineSystemId[] = {0xed, 0xef, 0x8b, 0xa9, 0x79, 0xd6,</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;                                     0x4a, 0xce, 0xa3, 0xc8, 0x27, 0xdc,</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;                                     0xd5, 0x1d, 0x21, 0xed};</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">class </span>KeyFetcher;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">class </span>RequestSigner;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">template</span> &lt;<span class="keyword">class</span> T&gt; <span class="keyword">class </span>ProducerConsumerQueue;</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="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a> : <span class="keyword">public</span> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</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="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">WidevineKeySource</a>(<span class="keyword">const</span> std::string&amp; server_url, <span class="keywordtype">bool</span> add_common_pssh);</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;  ~<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</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">FetchKeys</a>(uint32_t asset_id) <span class="keyword">override</span>;</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;  <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">GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</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">GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</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">GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                            TrackType track_type,</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                            <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; content_id,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                   <span class="keyword">const</span> std::string&amp; policy);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">set_signer</a>(scoped_ptr&lt;RequestSigner&gt; signer);</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">set_key_fetcher</a>(scoped_ptr&lt;KeyFetcher&gt; key_fetcher);</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="keyword">protected</span>:</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</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="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="keyword">typedef</span> std::map&lt;TrackType, EncryptionKey*&gt; EncryptionKeyMap;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keyword">class </span>RefCountedEncryptionKeyMap;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</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="l00074"></a><span class="lineno">   74</span>&#160;      <a class="code" href="../../d5/d33/classshaka_1_1media_1_1ProducerConsumerQueue.html">EncryptionKeyQueue</a>;</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="comment">// Internal routine for getting keys.</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> GetKeyInternal(uint32_t crypto_period_index,</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;                        TrackType track_type,</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;                        <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key);</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">// The closure task to fetch keys repeatedly.</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordtype">void</span> FetchKeysTask();</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">// Fetch keys from server.</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                           uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;                           <span class="keywordtype">bool</span> widevine_classic);</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="comment">// Fill |request| with necessary fields for Widevine encryption request.</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// |request| should not be NULL.</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keywordtype">void</span> FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;                   uint32_t first_crypto_period_index,</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;                   std::string* request);</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="comment">// Base64 escape and format the request. Optionally sign the request if a</span></div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="comment">// signer is provided. |message| should not be NULL. Return OK on success.</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request, std::string* message);</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// Decode |response| from JSON formatted |raw_response|.</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="comment">// |response| should not be NULL.</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordtype">bool</span> DecodeResponse(<span class="keyword">const</span> std::string&amp; raw_response, std::string* response);</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="comment">// Extract encryption key from |response|, which is expected to be properly</span></div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="comment">// formatted. |transient_error| will be set to true if it fails and the</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="comment">// failure is because of a transient error from the server. |transient_error|</span></div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="comment">// should not be NULL.</span></div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordtype">bool</span> ExtractEncryptionKey(<span class="keywordtype">bool</span> enable_key_rotation,</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;                            <span class="keywordtype">bool</span> widevine_classic,</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;                            <span class="keyword">const</span> std::string&amp; response,</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;                            <span class="keywordtype">bool</span>* transient_error);</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="comment">// Push the keys to the key pool.</span></div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keywordtype">bool</span> PushToKeyPool(EncryptionKeyMap* encryption_key_map);</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">// The fetcher object used to fetch keys from the license service.</span></div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="comment">// It is initialized to a default fetcher on class initialization.</span></div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="comment">// Can be overridden using set_key_fetcher for testing or other purposes.</span></div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  scoped_ptr&lt;KeyFetcher&gt; key_fetcher_;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  std::string server_url_;</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  scoped_ptr&lt;RequestSigner&gt; signer_;</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  base::DictionaryValue request_dict_;</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="keyword">const</span> uint32_t crypto_period_count_;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  base::Lock lock_;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordtype">bool</span> add_common_pssh_;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  <span class="keywordtype">bool</span> key_production_started_;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  base::WaitableEvent start_key_production_;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  uint32_t first_crypto_period_index_;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  scoped_ptr&lt;EncryptionKeyQueue&gt; key_pool_;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  EncryptionKeyMap encryption_key_map_;  <span class="comment">// For non key rotation request.</span></div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> common_encryption_request_status_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>);</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">// namespace media</span></div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1WidevineKeySource_html_abdff0d3cc5f59b744c68b11b0c1f6272"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">shaka::media::WidevineKeySource::set_signer</a></div><div class="ttdeci">void set_signer(scoped_ptr&lt; RequestSigner &gt; signer)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00280">widevine_key_source.cc:280</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 &quot;packager/base/synchronization/waitable_event.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/values.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/closure_thread.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="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">const</span> uint8_t kWidevineSystemId[] = {0xed, 0xef, 0x8b, 0xa9, 0x79, 0xd6,</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;                                     0x4a, 0xce, 0xa3, 0xc8, 0x27, 0xdc,</div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;                                     0xd5, 0x1d, 0x21, 0xed};</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">class </span>KeyFetcher;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">class </span>RequestSigner;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">template</span> &lt;<span class="keyword">class</span> T&gt; <span class="keyword">class </span>ProducerConsumerQueue;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">   30</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a> : <span class="keyword">public</span> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</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="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a93480a98e423d0456482844ac629bd2e">WidevineKeySource</a>(<span class="keyword">const</span> std::string&amp; server_url, <span class="keywordtype">bool</span> add_common_pssh);</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;  ~<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</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">FetchKeys</a>(uint32_t asset_id) <span class="keyword">override</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;  <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">GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</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">GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</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">GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;                            TrackType track_type,</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                            <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</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">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; content_id,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                   <span class="keyword">const</span> std::string&amp; policy);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">set_signer</a>(std::unique_ptr&lt;RequestSigner&gt; signer);</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">set_key_fetcher</a>(std::unique_ptr&lt;KeyFetcher&gt; key_fetcher);</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="keyword">protected</span>:</div>
+<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="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>
+<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">// Internal routine for getting keys.</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> GetKeyInternal(uint32_t crypto_period_index,</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;                        TrackType track_type,</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;                        <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key);</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">// The closure task to fetch keys repeatedly.</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordtype">void</span> FetchKeysTask();</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">// Fetch keys from server.</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> FetchKeysInternal(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                           uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                           <span class="keywordtype">bool</span> widevine_classic);</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">// Fill |request| with necessary fields for Widevine encryption request.</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="comment">// |request| should not be NULL.</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="keywordtype">void</span> FillRequest(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;                   uint32_t first_crypto_period_index,</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;                   std::string* request);</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="comment">// Base64 escape and format the request. Optionally sign the request if a</span></div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="comment">// signer is provided. |message| should not be NULL. Return OK on success.</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> GenerateKeyMessage(<span class="keyword">const</span> std::string&amp; request, std::string* message);</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// Decode |response| from JSON formatted |raw_response|.</span></div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// |response| should not be NULL.</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="keywordtype">bool</span> DecodeResponse(<span class="keyword">const</span> std::string&amp; raw_response, std::string* response);</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="comment">// Extract encryption key from |response|, which is expected to be properly</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="comment">// formatted. |transient_error| will be set to true if it fails and the</span></div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="comment">// failure is because of a transient error from the server. |transient_error|</span></div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  <span class="comment">// should not be NULL.</span></div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keywordtype">bool</span> ExtractEncryptionKey(<span class="keywordtype">bool</span> enable_key_rotation,</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;                            <span class="keywordtype">bool</span> widevine_classic,</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;                            <span class="keyword">const</span> std::string&amp; response,</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;                            <span class="keywordtype">bool</span>* transient_error);</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="comment">// Push the keys to the key pool.</span></div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;  <span class="keywordtype">bool</span> PushToKeyPool(EncryptionKeyMap* encryption_key_map);</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">// The fetcher object used to fetch keys from the license service.</span></div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  <span class="comment">// It is initialized to a default fetcher on class initialization.</span></div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;  <span class="comment">// Can be overridden using set_key_fetcher for testing or other purposes.</span></div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  std::unique_ptr&lt;KeyFetcher&gt; key_fetcher_;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  std::string server_url_;</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  std::unique_ptr&lt;RequestSigner&gt; signer_;</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  base::DictionaryValue request_dict_;</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="keyword">const</span> uint32_t crypto_period_count_;</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  base::Lock lock_;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordtype">bool</span> add_common_pssh_;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordtype">bool</span> key_production_started_;</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  base::WaitableEvent start_key_production_;</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  uint32_t first_crypto_period_index_;</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  std::unique_ptr&lt;EncryptionKeyQueue&gt; key_pool_;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  EncryptionKeyMap encryption_key_map_;  <span class="comment">// For non key rotation request.</span></div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> common_encryption_request_status_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a>);</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="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#l00175">widevine_key_source.cc:175</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#l00258">widevine_key_source.cc:258</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#l00232">widevine_key_source.cc:232</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_afc5154b2994b5fe1f8f0c494bbd2bcdd"><div class="ttname"><a href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">shaka::media::WidevineKeySource::set_key_fetcher</a></div><div class="ttdeci">void set_key_fetcher(scoped_ptr&lt; KeyFetcher &gt; key_fetcher)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d89/widevine__key__source_8cc_source.html#l00284">widevine_key_source.cc:284</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#l00031">widevine_key_source.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#l00020">key_source.h:20</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#l00284">widevine_key_source.cc:284</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_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_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#l00031">key_source.h:31</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#l00280">widevine_key_source.cc:280</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 dd76bfa1e8..13aba9f8ca 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 56ade0dd75..e0c3e61750 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
@@ -107,18 +107,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>progress_target</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#aeed8f5be9d9d7266afd017e0e5692d8d">sample_duration</a>() const </td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, scoped_ptr&lt; FileType &gt; ftyp, scoped_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, std::unique_ptr&lt; FileType &gt; ftyp, std::unique_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>set_progress_target</b>(uint64_t progress_target) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">SetComplete</a>()</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>sidx</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SingleSegmentSegmenter</b>(const MuxerOptions &amp;options, scoped_ptr&lt; FileType &gt; ftyp, scoped_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SingleSegmentSegmenter</b>(const MuxerOptions &amp;options, std::unique_ptr&lt; FileType &gt; ftyp, std::unique_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#afd8bb3584c984c711615800ad93642a3">UpdateProgress</a>(uint64_t progress)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~Segmenter</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~SingleSegmentSegmenter</b>() override (defined in <a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d0/dab/classshaka_1_1media_1_1mp4_1_1SingleSegmentSegmenter.html">shaka::media::mp4::SingleSegmentSegmenter</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 d9a3c93020..fbc8a9de28 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bbaa1c685c..5cf8e5caa1 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 b10483d51b..61d1d08c56 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 336ab24c74..017539f478 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
@@ -96,15 +96,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a5fc925f3324b5cfab955b1fac1f52094">AddSample</a>(scoped_refptr&lt; MediaSample &gt; sample)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ac92da7c996e2a270fd704facc8f7a149">Finalize</a>()</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2">Initialize</a>(const StreamInfo &amp;stream_info, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">InjectPesPacketGeneratorForTesting</a>(scoped_ptr&lt; PesPacketGenerator &gt; generator)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">InjectTsWriterForTesting</a>(scoped_ptr&lt; TsWriter &gt; writer)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">InjectPesPacketGeneratorForTesting</a>(std::unique_ptr&lt; PesPacketGenerator &gt; generator)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">InjectTsWriterForTesting</a>(std::unique_ptr&lt; TsWriter &gt; writer)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">SetTsWriterFileOpenedForTesting</a>(bool value)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#af0e91f691388ecffb8a473554707c917">TsSegmenter</a>(const MuxerOptions &amp;options, MuxerListener *listener)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~TsSegmenter</b>() (defined in <a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a>)</td><td class="entry"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d2dcf02af8..ef2c72cc54 100644
--- a/docs/da/d88/mp4__muxer_8cc_source.html
+++ b/docs/da/d88/mp4__muxer_8cc_source.html
@@ -174,8 +174,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> MP4Muxer::Initialize() {</div>
 <div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  DCHECK(!streams().empty());</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;  scoped_ptr&lt;FileType&gt; ftyp(<span class="keyword">new</span> FileType);</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  scoped_ptr&lt;Movie&gt; moov(<span class="keyword">new</span> Movie);</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  std::unique_ptr&lt;FileType&gt; ftyp(<span class="keyword">new</span> FileType);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  std::unique_ptr&lt;Movie&gt; moov(<span class="keyword">new</span> Movie);</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;  ftyp-&gt;major_brand = FOURCC_dash;</div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  ftyp-&gt;compatible_brands.push_back(FOURCC_iso6);</div>
@@ -224,11 +224,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">if</span> (options().single_segment) {</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;    segmenter_.reset(</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;        <span class="keyword">new</span> SingleSegmentSegmenter(options(), ftyp.Pass(), moov.Pass()));</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;    segmenter_.reset(<span class="keyword">new</span> SingleSegmentSegmenter(options(), std::move(ftyp),</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                                                std::move(moov)));</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  } <span class="keywordflow">else</span> {</div>
 <div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    segmenter_.reset(</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keyword">new</span> MultiSegmentSegmenter(options(), ftyp.Pass(), moov.Pass()));</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keyword">new</span> MultiSegmentSegmenter(options(), std::move(ftyp), std::move(moov)));</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="keyword">const</span> Status segmenter_initialized = segmenter_-&gt;Initialize(</div>
@@ -496,14 +496,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_1mp4_1_1MP4Muxer_html_a5b6a878865250e3e17268c011a361497"><div class="ttname"><a href="../../db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html#a5b6a878865250e3e17268c011a361497">shaka::media::mp4::MP4Muxer::MP4Muxer</a></div><div class="ttdeci">MP4Muxer(const MuxerOptions &amp;options)</div><div class="ttdoc">Create a MP4Muxer object from MuxerOptions. </div><div class="ttdef"><b>Definition:</b> <a href="../../da/d88/mp4__muxer_8cc_source.html#l00082">mp4_muxer.cc:82</a></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_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00180">file.cc:180</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a6981994874ee5832e3394744fd51fd79"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79">shaka::media::File::GetFileSize</a></div><div class="ttdeci">static int64_t GetFileSize(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00177">file.cc:177</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_1MuxerListener_html_a31536ec385a7ec22f323a42b872b499a"><div class="ttname"><a href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html#a31536ec385a7ec22f323a42b872b499a">shaka::media::MuxerListener::OnMediaStart</a></div><div class="ttdeci">virtual void OnMediaStart(const MuxerOptions &amp;muxer_options, const StreamInfo &amp;stream_info, uint32_t time_scale, ContainerType container_type)=0</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d450180a9a..09d023b1f6 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 a831370edd..eaee0b7a03 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 90359dd515..01732be19a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 60535ac3b9..1d588c6e26 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 83a56d5b7e..e7a102e51b 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 7ecb6a17d1..35323e479b 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 de70230d0a..ed82183649 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 e1604bb8d3..c7946c5584 100644
--- a/docs/da/db2/classshaka_1_1Representation-members.html
+++ b/docs/da/db2/classshaka_1_1Representation-members.html
@@ -103,7 +103,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0"><td class="entry"><b>kSuppressHeight</b> enum value (defined in <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a>)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>kSuppressWidth</b> enum value (defined in <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a>)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>MpdBuilderTest</b> (defined in <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a>)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">Representation</a>(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, scoped_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a>(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; RepresentationStateChangeListener &gt; state_change_listener)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">SetSampleDuration</a>(uint32_t sample_duration)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>SuppressFlag</b> enum name (defined in <a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a>)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a473e45dbbf64e6ab6ed670ccedac84ed">SuppressOnce</a>(SuppressFlag flag)</td><td class="entry"><a class="el" href="../../de/d52/classshaka_1_1Representation.html">shaka::Representation</a></td><td class="entry"></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a7462c9f28..777b58f04a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 2dd4b534b8..aeaf3cda9c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 2ac0601a03..dce158cfe0 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d9028992b1..675efaea93 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 66244d2930..8cf75d9d24 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a5336b40cd..4510651f80 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 ffc344acea..8ae126995f 100644
--- a/docs/da/dd1/fragmenter_8h_source.html
+++ b/docs/da/dd1/fragmenter_8h_source.html
@@ -96,11 +96,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_MP4_FRAGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP4_FRAGMENTER_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;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 &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/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&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/base/logging.h&quot;</span></div>
+<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/status.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>
@@ -162,7 +162,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  int64_t presentation_start_time_;</div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  int64_t earliest_presentation_time_;</div>
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  int64_t first_sap_time_;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  scoped_ptr&lt;BufferWriter&gt; data_;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  std::unique_ptr&lt;BufferWriter&gt; data_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a675d1d98629a3d10f9ef191b9e950a69">Fragmenter</a>);</div>
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;};</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 f0866ead79..ad6f05764f 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 bd0f3af612..8ff55eacd8 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 8c0240ebd0..c72428367c 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 7a17a01cdb..0a18ab82e8 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b65872dec9..b8ac8e3dc6 100644
--- a/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html
+++ b/docs/da/ddd/classshaka_1_1media_1_1WidevineKeySource.html
@@ -112,10 +112,10 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:a93480a98e423d0456482844ac629bd2e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a6fb9680be887d3b9367e015029f909f2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a6fb9680be887d3b9367e015029f909f2">FetchKeys</a> (const std::vector&lt; uint8_t &gt; &amp;content_id, const std::string &amp;policy)</td></tr>
 <tr class="separator:a6fb9680be887d3b9367e015029f909f2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:abdff0d3cc5f59b744c68b11b0c1f6272"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">set_signer</a> (scoped_ptr&lt; <a class="el" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> &gt; signer)</td></tr>
-<tr class="separator:abdff0d3cc5f59b744c68b11b0c1f6272"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afc5154b2994b5fe1f8f0c494bbd2bcdd"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">set_key_fetcher</a> (scoped_ptr&lt; <a class="el" href="../../df/d66/classshaka_1_1media_1_1KeyFetcher.html">KeyFetcher</a> &gt; key_fetcher)</td></tr>
-<tr class="separator:afc5154b2994b5fe1f8f0c494bbd2bcdd"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a48d182da15ecc85e2ae7fd164ba0a526"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">set_signer</a> (std::unique_ptr&lt; <a class="el" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> &gt; signer)</td></tr>
+<tr class="separator:a48d182da15ecc85e2ae7fd164ba0a526"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a97c0565df9381e178ebb50c193cebd04"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">set_key_fetcher</a> (std::unique_ptr&lt; <a class="el" href="../../df/d66/classshaka_1_1media_1_1KeyFetcher.html">KeyFetcher</a> &gt; key_fetcher)</td></tr>
+<tr class="separator:a97c0565df9381e178ebb50c193cebd04"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">KeySource implementation overrides.</div></td></tr>
 <tr class="memitem:ae6490d21a6538b9c909fdf996398e576"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ae6490d21a6538b9c909fdf996398e576">FetchKeys</a> (const std::vector&lt; uint8_t &gt; &amp;pssh_box) override</td></tr>
 <tr class="separator:ae6490d21a6538b9c909fdf996398e576"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -163,7 +163,7 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="../../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html">WidevineKeySource</a> talks to the Widevine encryption service to acquire the encryption keys. </p>
 
-<p>Definition at line <a class="el" href="../../da/d5c/widevine__key__source_8h_source.html#l00031">31</a> of file <a class="el" href="../../da/d5c/widevine__key__source_8h_source.html">widevine_key_source.h</a>.</p>
+<p>Definition at line <a class="el" href="../../da/d5c/widevine__key__source_8h_source.html#l00030">30</a> of file <a class="el" href="../../da/d5c/widevine__key__source_8h_source.html">widevine_key_source.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a93480a98e423d0456482844ac629bd2e"></a>
 <div class="memitem">
@@ -493,14 +493,14 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 </div>
 </div>
-<a class="anchor" id="afc5154b2994b5fe1f8f0c494bbd2bcdd"></a>
+<a class="anchor" id="a97c0565df9381e178ebb50c193cebd04"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void shaka::media::WidevineKeySource::set_key_fetcher </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../df/d66/classshaka_1_1media_1_1KeyFetcher.html">KeyFetcher</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../df/d66/classshaka_1_1media_1_1KeyFetcher.html">KeyFetcher</a> &gt;&#160;</td>
           <td class="paramname"><em>key_fetcher</em></td><td>)</td>
           <td></td>
         </tr>
@@ -518,14 +518,14 @@ static std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="
 
 </div>
 </div>
-<a class="anchor" id="abdff0d3cc5f59b744c68b11b0c1f6272"></a>
+<a class="anchor" id="a48d182da15ecc85e2ae7fd164ba0a526"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void shaka::media::WidevineKeySource::set_signer </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../df/d3c/classshaka_1_1media_1_1RequestSigner.html">RequestSigner</a> &gt;&#160;</td>
           <td class="paramname"><em>signer</em></td><td>)</td>
           <td></td>
         </tr>
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 1f8c68f353..d39bfe42c2 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 c49e60e6b8..0d632ea23b 100644
--- a/docs/da/de2/mock__mpd__builder_8cc_source.html
+++ b/docs/da/de2/mock__mpd__builder_8cc_source.html
@@ -116,14 +116,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;    : Representation(MediaInfo(),</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;                     kDefaultMpdOptions,</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                     representation_id,</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                     scoped_ptr&lt;RepresentationStateChangeListener&gt;()) {}</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                     std::unique_ptr&lt;RepresentationStateChangeListener&gt;()) {}</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;MockRepresentation::~MockRepresentation() {}</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">// namespace shaka</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 455f9b522f..fa1b93635e 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 de94d7a4b1..eac3cf51b4 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 acd4f7bac6..eb9cf856ca 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 c7408078e5..9b44dc7e3c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 4589fbfa5a..9dcd9edfb0 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 820752c152..d189daa677 100644
--- a/docs/da/df4/aes__decryptor_8cc_source.html
+++ b/docs/da/df4/aes__decryptor_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 95902ff4fc..5a47d4b23d 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 6dd1f27bc9..db80cf12d3 100644
--- a/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html
+++ b/docs/da/df9/classshaka_1_1media_1_1AesPatternCryptor-members.html
@@ -95,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <table class="directory">
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>aes_key</b>() const  (defined in <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a>)</td><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8">AesCryptor</a>(ConstantIvFlag constant_iv_flag)</td><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">AesPatternCryptor</a>(uint8_t crypt_byte_block, uint8_t skip_byte_block, PatternEncryptionMode encryption_mode, ConstantIvFlag constant_iv_flag, scoped_ptr&lt; AesCryptor &gt; cryptor)</td><td class="entry"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">AesPatternCryptor</a>(uint8_t crypt_byte_block, uint8_t skip_byte_block, PatternEncryptionMode encryption_mode, ConstantIvFlag constant_iv_flag, std::unique_ptr&lt; AesCryptor &gt; cryptor)</td><td class="entry"><a class="el" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html">shaka::media::AesPatternCryptor</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>ConstantIvFlag</b> enum name (defined in <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a>)</td><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Crypt</b>(const std::vector&lt; uint8_t &gt; &amp;text, std::vector&lt; uint8_t &gt; *crypt_text) (defined in <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a>)</td><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>Crypt</b>(const std::string &amp;text, std::string *crypt_text) (defined in <a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a>)</td><td class="entry"><a class="el" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">shaka::media::AesCryptor</a></td><td class="entry"></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3df944808e..e8164be790 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f6a213b401..8d4a38b576 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 a4ebbc76d1..2a62e4ba83 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 0de7ac57b9..c899343185 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 46e0ea29c8..aa474e99d1 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 8383f97eb3..bd5a8cecbe 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
@@ -127,10 +127,10 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <tr class="separator:adc96fbcd6a4d4ba9845f8d00974ace0f inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Cancel</a> ()</td></tr>
 <tr class="separator:a9204fe352d13cea8a367ae9c14e9639e inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a> (scoped_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
-<tr class="separator:a786fbb91d7ece58c68334f5cef16ae71 inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a> (scoped_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
-<tr class="separator:a0a2dfb3924ce1307f98c339e6587369c inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a> (std::unique_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
+<tr class="separator:a0e76dd0a5c07dd538221459365ae824a inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a> (std::unique_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
+<tr class="separator:a25a146d553c385aad70dbff6b3e87eec inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0a1451c6277554ad1956225a345f5d3d"></a>
 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"><b>streams</b> () const </td></tr>
 <tr class="separator:a0a1451c6277554ad1956225a345f5d3d inherit pub_methods_classshaka_1_1media_1_1Muxer"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 972793b75a..fb5fe786c2 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 44140ea509..b4818f2366 100644
--- a/docs/db/d31/track__run__iterator_8cc_source.html
+++ b/docs/db/d31/track__run__iterator_8cc_source.html
@@ -677,7 +677,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00588"></a><span class="lineno">  588</span>&#160;  <span class="keywordflow">return</span> <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#aee813f01267e89ff00fdb836bb3a159d">video_description</a>().sinf.info.track_encryption;</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;</div>
-<div class="line"><a name="l00591"></a><span class="lineno"><a class="line" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">  591</a></span>&#160;scoped_ptr&lt;DecryptConfig&gt; <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">TrackRunIterator::GetDecryptConfig</a>() {</div>
+<div class="line"><a name="l00591"></a><span class="lineno"><a class="line" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">  591</a></span>&#160;std::unique_ptr&lt;DecryptConfig&gt; <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">TrackRunIterator::GetDecryptConfig</a>() {</div>
 <div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160;  <span class="keywordtype">size_t</span> sample_idx = sample_itr_ - run_itr_-&gt;samples.begin();</div>
 <div class="line"><a name="l00593"></a><span class="lineno">  593</span>&#160;  DCHECK_LT(sample_idx, run_itr_-&gt;sample_encryption_entries.size());</div>
 <div class="line"><a name="l00594"></a><span class="lineno">  594</span>&#160;  <span class="keyword">const</span> <a class="code" href="../../d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html">SampleEncryptionEntry</a>&amp; sample_encryption_entry =</div>
@@ -690,7 +690,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00601"></a><span class="lineno">  601</span>&#160;  <span class="keywordflow">if</span> (total_size_of_subsamples != 0 &amp;&amp;</div>
 <div class="line"><a name="l00602"></a><span class="lineno">  602</span>&#160;      total_size_of_subsamples != static_cast&lt;size_t&gt;(sample_size())) {</div>
 <div class="line"><a name="l00603"></a><span class="lineno">  603</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Incorrect CENC subsample size.&quot;</span>;</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;DecryptConfig&gt;();</div>
+<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;DecryptConfig&gt;();</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;</div>
 <div class="line"><a name="l00607"></a><span class="lineno">  607</span>&#160;  FourCC protection_scheme = is_audio() ? <a class="code" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#adb40e673e8025ca51740a50eb20d89b2">audio_description</a>().sinf.type.type</div>
@@ -704,10 +704,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00615"></a><span class="lineno">  615</span>&#160;    iv = track_encryption().default_constant_iv;</div>
 <div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160;    <span class="keywordflow">if</span> (iv.empty()) {</div>
 <div class="line"><a name="l00617"></a><span class="lineno">  617</span>&#160;      LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;IV cannot be empty.&quot;</span>;</div>
-<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;      <span class="keywordflow">return</span> scoped_ptr&lt;DecryptConfig&gt;();</div>
+<div class="line"><a name="l00618"></a><span class="lineno">  618</span>&#160;      <span class="keywordflow">return</span> std::unique_ptr&lt;DecryptConfig&gt;();</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> scoped_ptr&lt;DecryptConfig&gt;(<span class="keyword">new</span> <a class="code" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a>(</div>
+<div class="line"><a name="l00621"></a><span class="lineno">  621</span>&#160;  <span class="keywordflow">return</span> std::unique_ptr&lt;DecryptConfig&gt;(<span class="keyword">new</span> <a class="code" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a>(</div>
 <div class="line"><a name="l00622"></a><span class="lineno">  622</span>&#160;      track_encryption().default_kid, iv, sample_encryption_entry.subsamples,</div>
 <div class="line"><a name="l00623"></a><span class="lineno">  623</span>&#160;      protection_scheme, track_encryption().default_crypt_byte_block,</div>
 <div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160;      track_encryption().default_skip_byte_block));</div>
@@ -717,7 +717,6 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160;}  <span class="comment">// namespace media</span></div>
 <div class="line"><a name="l00629"></a><span class="lineno">  629</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator_html_abed93049cf801c0c3795801da9d5ff7c"><div class="ttname"><a href="../../d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html#abed93049cf801c0c3795801da9d5ff7c">shaka::media::mp4::ChunkInfoIterator::AdvanceSample</a></div><div class="ttdeci">bool AdvanceSample()</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d3b/chunk__info__iterator_8cc_source.html#l00038">chunk_info_iterator.cc:38</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_a1badd6160074e1bc2ef0f1e289a81524"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">shaka::media::mp4::TrackRunIterator::GetDecryptConfig</a></div><div class="ttdeci">scoped_ptr&lt; DecryptConfig &gt; GetDecryptConfig()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00591">track_run_iterator.cc:591</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator_html_afece0bf8ca3f42fc561c419c945833f0"><div class="ttname"><a href="../../db/d4e/classshaka_1_1media_1_1mp4_1_1CompositionOffsetIterator.html#afece0bf8ca3f42fc561c419c945833f0">shaka::media::mp4::CompositionOffsetIterator::sample_offset</a></div><div class="ttdeci">int64_t sample_offset() const </div><div class="ttdef"><b>Definition:</b> <a href="../../df/d1c/composition__offset__iterator_8h_source.html#l00040">composition_offset_iterator.h:40</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator_html_aaa0ea588fba6267be900cb0dfc787a2a"><div class="ttname"><a href="../../d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html#aaa0ea588fba6267be900cb0dfc787a2a">shaka::media::mp4::DecodingTimeIterator::NumSamples</a></div><div class="ttdeci">uint32_t NumSamples() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d45/decoding__time__iterator_8cc_source.html#l00061">decoding_time_iterator.cc:61</a></div></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>
@@ -748,6 +747,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1SampleEncryption_html_a0498009b07beb46e029c65bfb55fc741"><div class="ttname"><a href="../../d4/dad/structshaka_1_1media_1_1mp4_1_1SampleEncryption.html#a0498009b07beb46e029c65bfb55fc741">shaka::media::mp4::SampleEncryption::ParseFromSampleEncryptionData</a></div><div class="ttdeci">bool ParseFromSampleEncryptionData(uint8_t iv_size, std::vector&lt; SampleEncryptionEntry &gt; *sample_encryption_entries) const </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/dee/box__definitions_8cc_source.html#l00359">box_definitions.cc:359</a></div></div>
 <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="structshaka_1_1media_1_1mp4_1_1Movie_html"><div class="ttname"><a href="../../d0/d9a/structshaka_1_1media_1_1mp4_1_1Movie.html">shaka::media::mp4::Movie</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00656">box_definitions.h:656</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp4_1_1TrackRunIterator_html_af1dbb0a9037617c2b80506ee161dfcfa"><div class="ttname"><a href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">shaka::media::mp4::TrackRunIterator::GetDecryptConfig</a></div><div class="ttdeci">std::unique_ptr&lt; DecryptConfig &gt; GetDecryptConfig()</div><div class="ttdef"><b>Definition:</b> <a href="../../db/d31/track__run__iterator_8cc_source.html#l00591">track_run_iterator.cc:591</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator_html_aec68fe0d0dcccedfe2d898320fd534d5"><div class="ttname"><a href="../../d1/d20/classshaka_1_1media_1_1mp4_1_1DecodingTimeIterator.html#aec68fe0d0dcccedfe2d898320fd534d5">shaka::media::mp4::DecodingTimeIterator::AdvanceSample</a></div><div class="ttdeci">bool AdvanceSample()</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d45/decoding__time__iterator_8cc_source.html#l00024">decoding_time_iterator.cc:24</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator_html_ae68681fe24bdf70b9f0c2d2e5610f32a"><div class="ttname"><a href="../../d9/d57/classshaka_1_1media_1_1mp4_1_1ChunkInfoIterator.html#ae68681fe24bdf70b9f0c2d2e5610f32a">shaka::media::mp4::ChunkInfoIterator::LastFirstChunk</a></div><div class="ttdeci">uint32_t LastFirstChunk() const </div><div class="ttdef"><b>Definition:</b> <a href="../../db/dd2/chunk__info__iterator_8h_source.html#l00057">chunk_info_iterator.h:57</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry_html"><div class="ttname"><a href="../../d6/dcb/structshaka_1_1media_1_1mp4_1_1SampleEncryptionEntry.html">shaka::media::mp4::SampleEncryptionEntry</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d7b/box__definitions_8h_source.html#l00077">box_definitions.h:77</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 53db58c14b..c56d655f41 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
@@ -94,18 +94,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <p>This is the complete list of members for <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a>, including all inherited members.</p>
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a71ea0819224b94ba9df5c951424bc6b1">Flush</a>()</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">GetNextPesPacket</a>()</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">GetNextPesPacket</a>()</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">Initialize</a>(const StreamInfo &amp;stream)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">NumberOfReadyPesPackets</a>()</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>PesPacketGenerator</b>() (defined in <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a>)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>PesPacketGeneratorTest</b> (defined in <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a>)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">PushSample</a>(scoped_refptr&lt; MediaSample &gt; sample)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">SetEncryptionKey</a>(scoped_ptr&lt; EncryptionKey &gt; encryption_key)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">SetEncryptionKey</a>(std::unique_ptr&lt; EncryptionKey &gt; encryption_key)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~PesPacketGenerator</b>() (defined in <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a>)</td><td class="entry"><a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">shaka::media::mp2t::PesPacketGenerator</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 42e39a585e..5f5c59cf8c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3ebce34c10..c10655fb8b 100644
--- a/docs/db/d45/mpd__notify__muxer__listener_8h_source.html
+++ b/docs/db/d45/mpd__notify__muxer__listener_8h_source.html
@@ -99,10 +99,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;list&gt;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;memory&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/macros.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/event/muxer_listener.h&quot;</span></div>
 <div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;</div>
@@ -153,7 +153,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  <a class="code" href="../../d3/dd0/classshaka_1_1MpdNotifier.html">MpdNotifier</a>* <span class="keyword">const</span> mpd_notifier_;</div>
 <div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  uint32_t notification_id_;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  scoped_ptr&lt;MediaInfo&gt; media_info_;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  std::unique_ptr&lt;MediaInfo&gt; media_info_;</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> is_encrypted_;</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// Storage for values passed to OnEncryptionInfoReady().</span></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6eb73d55f9..16f3b256e4 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 b65174775d..3e9251c0fd 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 d13c4dc8a1..7c92ebe129 100644
--- a/docs/db/d51/mp2t__media__parser_8h_source.html
+++ b/docs/db/d51/mp2t__media__parser_8h_source.html
@@ -96,104 +96,103 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;deque&gt;</span></div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;map&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/compiler_specific.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&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/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/byte_queue.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_parser.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>MediaSample;</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>mp2t {</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">class </span>PidState;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">class </span>TsPacket;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">class </span>TsSection;</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">typedef</span> std::deque&lt;scoped_refptr&lt;MediaSample&gt; &gt; SampleQueue;</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="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</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="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a>();</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  ~<a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;            <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;            <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) <span class="keyword">override</span>;</div>
-<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#afdb1a88116e3347e67afeb7715847135">Flush</a>() <span class="keyword">override</span> WARN_UNUSED_RESULT;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</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="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160; <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keyword">typedef</span> std::map&lt;int, PidState*&gt; PidMap;</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">// Callback invoked to register a Program Map Table.</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="comment">// Note: Does nothing if the PID is already registered.</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">void</span> RegisterPmt(<span class="keywordtype">int</span> program_number, <span class="keywordtype">int</span> pmt_pid);</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">// Callback invoked to register a PES pid.</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="comment">// Possible values for |media_type| are defined in:</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// ISO-13818.1 / ITU H.222 Table 2.34 &quot;Media type assignments&quot;.</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// |pes_pid| is part of the Program Map Table refered by |pmt_pid|.</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">void</span> RegisterPes(<span class="keywordtype">int</span> pmt_pid, <span class="keywordtype">int</span> pes_pid, <span class="keywordtype">int</span> media_type);</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;  <span class="comment">// Callback invoked each time the audio/video decoder configuration is</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="comment">// changed.</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> OnNewStreamInfo(<span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; new_stream_info);</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">// Callback invoked by the ES media parser</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="comment">// to emit a new audio/video access unit.</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">void</span> OnEmitSample(uint32_t pes_pid,</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;                    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; new_sample);</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">// Invoke the initialization callback if needed.</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">bool</span> FinishInitializationIfNeeded();</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="keywordtype">bool</span> EmitRemainingSamples();</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">   74</span>&#160;  <span class="keywordtype">void</span> set_sbr_in_mime_type(<span class="keywordtype">bool</span> sbr_in_mimetype) {</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    sbr_in_mimetype_ = sbr_in_mimetype; }</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="comment">// List of callbacks.</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a> init_cb_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a> new_sample_cb_;</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> sbr_in_mimetype_;</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">// Bytes of the TS media.</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> ts_byte_queue_;</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">// List of PIDs and their states.</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  PidMap pids_;</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="comment">// Whether |init_cb_| has been invoked.</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="keywordtype">bool</span> is_initialized_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</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;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;}  <span class="comment">// namespace shaka</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="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#l00026">media_parser.h:26</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#l00035">media_parser.h:35</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#l00158">mp2t_media_parser.cc:158</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#l00031">mp2t_media_parser.h:31</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#l00171">mp2t_media_parser.cc:171</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#l00044">media_parser.h:44</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#l00020">byte_queue.h:20</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#l00031">key_source.h:31</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#l00190">mp2t_media_parser.cc:190</a></div></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/byte_queue.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_parser.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;</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="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">class </span>MediaSample;</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>mp2t {</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">class </span>PidState;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">class </span>TsPacket;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="keyword">class </span>TsSection;</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">typedef</span> std::deque&lt;scoped_refptr&lt;MediaSample&gt; &gt; SampleQueue;</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"><a class="line" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">   30</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a> {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a>();</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  ~<a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</a>() <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="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;            <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;            <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#afdb1a88116e3347e67afeb7715847135">Flush</a>() <span class="keyword">override</span> WARN_UNUSED_RESULT;</div>
+<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="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>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  <span class="keywordtype">void</span> RegisterPmt(<span class="keywordtype">int</span> program_number, <span class="keywordtype">int</span> pmt_pid);</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">// Callback invoked to register a PES pid.</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// Possible values for |media_type| are defined in:</span></div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="comment">// ISO-13818.1 / ITU H.222 Table 2.34 &quot;Media type assignments&quot;.</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// |pes_pid| is part of the Program Map Table refered by |pmt_pid|.</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="keywordtype">void</span> RegisterPes(<span class="keywordtype">int</span> pmt_pid, <span class="keywordtype">int</span> pes_pid, <span class="keywordtype">int</span> media_type);</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">// Callback invoked each time the audio/video decoder configuration is</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// changed.</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keywordtype">void</span> OnNewStreamInfo(<span class="keyword">const</span> scoped_refptr&lt;StreamInfo&gt;&amp; new_stream_info);</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">// Callback invoked by the ES media parser</span></div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="comment">// to emit a new audio/video access unit.</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordtype">void</span> OnEmitSample(uint32_t pes_pid,</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;                    <span class="keyword">const</span> scoped_refptr&lt;MediaSample&gt;&amp; new_sample);</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">// Invoke the initialization callback if needed.</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keywordtype">bool</span> FinishInitializationIfNeeded();</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="keywordtype">bool</span> EmitRemainingSamples();</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> set_sbr_in_mime_type(<span class="keywordtype">bool</span> sbr_in_mimetype) {</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    sbr_in_mimetype_ = sbr_in_mimetype; }</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="comment">// List of callbacks.</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a> init_cb_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a> new_sample_cb_;</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> sbr_in_mimetype_;</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="comment">// Bytes of the TS media.</span></div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> ts_byte_queue_;</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">// List of PIDs and their states.</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  PidMap pids_;</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">// Whether |init_cb_| has been invoked.</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keywordtype">bool</span> is_initialized_;</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="../../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html">Mp2tMediaParser</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</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"><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_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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d386cb8650..73121e5310 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
@@ -96,56 +96,55 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_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;string&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/formats/webm/single_segment_segmenter.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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/status.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/webm/mkv_writer.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">struct </span>MuxerOptions;</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>webm {</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">   27</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> {</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options);</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  ~<a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a>() <span class="keyword">override</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="comment">// Segmenter implementation overrides.</span></div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</span>;</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="keyword">private</span>:</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> CopyFileWithClusterRewrite(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source,</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                                  <a class="code" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a>* dest,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                                  uint64_t last_size);</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;  scoped_ptr&lt;MkvWriter&gt; real_writer_;</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  std::string temp_file_name_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a>);</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 webm</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/status.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/mkv_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/formats/webm/single_segment_segmenter.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="l00020"></a><span class="lineno">   20</span>&#160;<span class="keyword">struct </span>MuxerOptions;</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>webm {</div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;</div>
+<div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">   26</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">SingleSegmentSegmenter</a> {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options);</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;  ~<a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</a>() <span class="keyword">override</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="comment">// Segmenter implementation overrides.</span></div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <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="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">bool</span> CopyFileWithClusterRewrite(<a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html">File</a>* source,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                                  <a class="code" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a>* dest,</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                                  uint64_t last_size);</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;  std::unique_ptr&lt;MkvWriter&gt; real_writer_;</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  std::string temp_file_name_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">TwoPassSingleSegmentSegmenter</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">   50</span>&#160;}  <span class="comment">// namespace webm</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter_html"><div class="ttname"><a href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d40/webm_2single__segment__segmenter_8h_source.html#l00026">single_segment_segmenter.h:26</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="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_1MkvWriter_html"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">shaka::media::MkvWriter</a></div><div class="ttdoc">An implementation of IMkvWriter using our File type. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dd6/mkv__writer_8h_source.html#l00021">mkv_writer.h:21</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_1webm_1_1TwoPassSingleSegmentSegmenter_html"><div class="ttname"><a href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html#l00027">two_pass_single_segment_segmenter.h:27</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter_html"><div class="ttname"><a href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html#l00026">two_pass_single_segment_segmenter.h:26</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 03915dfa1d..ceeb4d781e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 37788dc945..56f9002774 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3c7afcf47f..4a13d3c50b 100644
--- a/docs/db/d64/webvtt__media__parser_8h_source.html
+++ b/docs/db/d64/webvtt__media__parser_8h_source.html
@@ -170,18 +170,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="preprocessor">#endif  // MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html_af6c0fb7de806cccd0e1f9dd92b5310f3"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#af6c0fb7de806cccd0e1f9dd92b5310f3">shaka::media::WebVttMediaParser::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/d2f/webvtt__media__parser_8cc_source.html#l00221">webvtt_media_parser.cc:221</a></div></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#l00026">media_parser.h:26</a></div></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_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_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#l00035">media_parser.h:35</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_1WebVttMediaParser_html_a5295c061b251726d1525cefc091101a2"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#a5295c061b251726d1525cefc091101a2">shaka::media::WebVttMediaParser::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/d2f/webvtt__media__parser_8cc_source.html#l00250">webvtt_media_parser.cc:250</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebVttMediaParser_html_aa666cb1b9ee2ff940d9fc7efda4b50d7"><div class="ttname"><a href="../../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#aa666cb1b9ee2ff940d9fc7efda4b50d7">shaka::media::WebVttMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d1/d2f/webvtt__media__parser_8cc_source.html#l00228">webvtt_media_parser.cc:228</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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_1Cue_html"><div class="ttname"><a href="../../dd/dce/structshaka_1_1media_1_1Cue.html">shaka::media::Cue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d64/webvtt__media__parser_8h_source.html#l00023">webvtt_media_parser.h:23</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 0dd553f782..ce2cb19f03 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 ba674172e8..3681613bd3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ef42bb1ebc..f324b9d1d1 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 cb1a26757a..1f8c97b974 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>cluster_length_sec</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>cues</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DoFinalize</b>() override (defined in <a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(scoped_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(std::unique_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../dd/da5/classshaka_1_1media_1_1webm_1_1TwoPassSingleSegmentSegmenter.html">shaka::media::webm::TwoPassSingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a>()</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a66c49dfab5316bea5b7b318871aef129">FromBMFFTimescale</a>(uint64_t time_timescale)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a8de27c5b6480f968cbef9eafec3731d7">FromWebMTimecode</a>(uint64_t time_webm_timecode)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#a1708739c73c4565d5dfda6bedffd89a8">GetIndexRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#ae1395bcb6fb255b2695766c1e85b1aa3">GetInitRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>info</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a>(scoped_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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a>(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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>muxer_listener</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>seek_head</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_index_start</b>(uint64_t start) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>set_init_end</b>(uint64_t end) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_progress_target</b>(uint64_t target) (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_writer</b>(scoped_ptr&lt; MkvWriter &gt; writer) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_writer</b>(std::unique_ptr&lt; MkvWriter &gt; writer) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a6060ddc97c58e4435d1db932de17e131">SetCluster</a>(uint64_t start_webm_timecode, uint64_t position, MkvWriter *writer)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>SingleSegmentSegmenter</b>(const MuxerOptions &amp;options) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>track_id</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 d4a88f0796..378efb25cf 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 3a0c996b6c..1abd0b3763 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9c4ba00ad0..21878dff35 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 cfd808a315..02801c5836 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 20b36fa358..9e2a95c924 100644
--- a/docs/db/d8f/mp4__muxer_8h_source.html
+++ b/docs/db/d8f/mp4__muxer_8h_source.html
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="comment">// Get time in seconds since midnight, Jan. 1, 1904, in UTC Time.</span></div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  uint64_t IsoTimeNow();</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;  scoped_ptr&lt;Segmenter&gt; segmenter_;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  std::unique_ptr&lt;Segmenter&gt; segmenter_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html">MP4Muxer</a>);</div>
 <div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;};</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 f23e24b20e..7265e0d9d7 100644
--- a/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html
+++ b/docs/db/d94/classshaka_1_1media_1_1ClusterBuilder.html
@@ -108,16 +108,16 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>AddBlockGroup</b> (in
 <tr class="memitem:aa834e4b1c7e23bb2848e07f596e68d73"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa834e4b1c7e23bb2848e07f596e68d73"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>AddBlockGroupWithoutBlockDuration</b> (int track_num, int64_t timecode, int flags, bool is_key_frame, const uint8_t *data, int size)</td></tr>
 <tr class="separator:aa834e4b1c7e23bb2848e07f596e68d73"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a62f48b6dd2b07b882af506eb1866f1dd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a62f48b6dd2b07b882af506eb1866f1dd"></a>
-scoped_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>Finish</b> ()</td></tr>
-<tr class="separator:a62f48b6dd2b07b882af506eb1866f1dd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae3f59a86760ac66b7b9e7bf7b6be9d6e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae3f59a86760ac66b7b9e7bf7b6be9d6e"></a>
-scoped_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>FinishWithUnknownSize</b> ()</td></tr>
-<tr class="separator:ae3f59a86760ac66b7b9e7bf7b6be9d6e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9b82da5f8b60951bcfaba8720c13d657"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9b82da5f8b60951bcfaba8720c13d657"></a>
+std::unique_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>Finish</b> ()</td></tr>
+<tr class="separator:a9b82da5f8b60951bcfaba8720c13d657"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae93171e131b17a61f259f2c055fe5705"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae93171e131b17a61f259f2c055fe5705"></a>
+std::unique_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>FinishWithUnknownSize</b> ()</td></tr>
+<tr class="separator:ae93171e131b17a61f259f2c055fe5705"><td class="memSeparator" colspan="2">&#160;</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="../../d4/db2/cluster__builder_8h_source.html#l00029">29</a> of file <a class="el" href="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d4/db2/cluster__builder_8h_source.html#l00031">31</a> of file <a class="el" href="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.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="../../d4/db2/cluster__builder_8h_source.html">cluster_builder.h</a></li>
 <li>media/formats/webm/<a class="el" href="../../de/d17/cluster__builder_8cc_source.html">cluster_builder.cc</a></li>
@@ -125,7 +125,7 @@ scoped_ptr&lt; <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.h
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 53c7f3744b..05c27b9673 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ca6e5eb85d..e2347881e5 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 93e0a8f6e7..e70f108173 100644
--- a/docs/db/d96/wvm__media__parser_8h_source.html
+++ b/docs/db/d96/wvm__media__parser_8h_source.html
@@ -97,11 +97,11 @@ 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></div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;deque&gt;</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;string&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/base/compiler_specific.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/scoped_ptr.h&quot;</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;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/base/compiler_specific.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_parser.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/network_util.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/h264_byte_to_unit_stream_converter.h&quot;</span></div>
@@ -338,7 +338,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  std::deque&lt;DemuxStreamIdMediaSample&gt; media_sample_queue_;</div>
 <div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;  std::vector&lt;uint8_t&gt; sample_data_;</div>
 <div class="line"><a name="l00254"></a><span class="lineno">  254</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="l00255"></a><span class="lineno">  255</span>&#160;  scoped_ptr&lt;AesCbcDecryptor&gt; content_decryptor_;</div>
+<div class="line"><a name="l00255"></a><span class="lineno">  255</span>&#160;  std::unique_ptr&lt;AesCbcDecryptor&gt; content_decryptor_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html">WvmMediaParser</a>);</div>
 <div class="line"><a name="l00258"></a><span class="lineno">  258</span>&#160;};</div>
@@ -348,22 +348,22 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_</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#l00026">media_parser.h:26</a></div></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_1H264ByteToUnitStreamConverter_html"><div class="ttname"><a href="../../d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html">shaka::media::H264ByteToUnitStreamConverter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d7/dec/h264__byte__to__unit__stream__converter_8h_source.html#l00022">h264_byte_to_unit_stream_converter.h:22</a></div></div>
 <div class="ttc" id="structshaka_1_1media_1_1wvm_1_1PrevSampleData_html"><div class="ttname"><a href="../../d2/d0f/structshaka_1_1media_1_1wvm_1_1PrevSampleData.html">shaka::media::wvm::PrevSampleData</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d96/wvm__media__parser_8h_source.html#l00038">wvm_media_parser.h:38</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1wvm_1_1WvmMediaParser_html_a6f931f1702724a9b19c3078a7832bc77"><div class="ttname"><a href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html#a6f931f1702724a9b19c3078a7832bc77">shaka::media::wvm::WvmMediaParser::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="../../dd/d30/wvm__media__parser_8cc_source.html#l00117">wvm_media_parser.cc:117</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_1wvm_1_1WvmMediaParser_html_ac5680e3bd6cdb07fd65af3f39fce999a"><div class="ttname"><a href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html#ac5680e3bd6cdb07fd65af3f39fce999a">shaka::media::wvm::WvmMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d30/wvm__media__parser_8cc_source.html#l00519">wvm_media_parser.cc:519</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#l00035">media_parser.h:35</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#l00020">key_source.h:20</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="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_1wvm_1_1WvmMediaParser_html_a246702aa75891cbe396ca7cc11e13eeb"><div class="ttname"><a href="../../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html#a246702aa75891cbe396ca7cc11e13eeb">shaka::media::wvm::WvmMediaParser::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="../../dd/d30/wvm__media__parser_8cc_source.html#l00128">wvm_media_parser.cc:128</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#l00044">media_parser.h:44</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#l00031">key_source.h:31</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_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_1wvm_1_1DemuxStreamIdMediaSample_html"><div class="ttname"><a href="../../d1/da1/structshaka_1_1media_1_1wvm_1_1DemuxStreamIdMediaSample.html">shaka::media::wvm::DemuxStreamIdMediaSample</a></div><div class="ttdef"><b>Definition:</b> <a href="../../db/d96/wvm__media__parser_8h_source.html#l00029">wvm_media_parser.h:29</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 b3c23e0978..2c9a74b3d7 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 84d345dcd8..9d3763f230 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b1a666c15b..309bfab269 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9dc01603d7..e3559596c9 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 4a28a3d3dc..3f4bd17a47 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9b33ec11d6..2bf2557842 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 624447dbaf..f3a2c53c10 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3b53235d7f..ce8ce3062f 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 8be851a2f3..95228c9ab8 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b8820c9f7d..912f3b6ffa 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f420a5010e..a91fcdea77 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 63a11814ed..e085f90bbc 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 f1b41e3dbd..c927b9c322 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 90b407c6dd..d984ec0137 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 8aa75c0075..5e590bd6e9 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 aa64bffa51..5809d53f6e 100644
--- a/docs/db/dde/h265__parser_8cc_source.html
+++ b/docs/db/dde/h265__parser_8cc_source.html
@@ -95,8 +95,8 @@ 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/codecs/h265_parser.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;algorithm&gt;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;math.h&gt;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;math.h&gt;</span></div>
+<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>
@@ -499,7 +499,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_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="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>
@@ -609,7 +609,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_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="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>
@@ -1221,7 +1221,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 28f872052e..476d23fb42 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f7691632c2..7dc14f05d5 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 be425d3418..f558d6b659 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 10b05e7443..4ab54cac48 100644
--- a/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html
+++ b/docs/db/df6/classshaka_1_1media_1_1Cluster-members.html
@@ -93,14 +93,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Cluster</b>(scoped_ptr&lt; uint8_t[]&gt; data, int size) (defined in <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>)</td><td class="entry"><a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Cluster</b>(std::unique_ptr&lt; uint8_t[]&gt; data, int size) (defined in <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>)</td><td class="entry"><a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>data</b>() const  (defined in <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>)</td><td class="entry"><a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>size</b>() const  (defined in <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>)</td><td class="entry"><a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~Cluster</b>() (defined in <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a>)</td><td class="entry"><a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">shaka::media::Cluster</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 c8990032de..5bd98153d5 100644
--- a/docs/db/df6/muxer_8h_source.html
+++ b/docs/db/df6/muxer_8h_source.html
@@ -98,10 +98,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#ifndef MEDIA_BASE_MUXER_H_</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_BASE_MUXER_H_</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor"></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/base/memory/ref_counted.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/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/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/time/clock.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/fourccs.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>
@@ -133,9 +133,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Cancel</a>();</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a>(scoped_ptr&lt;MuxerListener&gt; muxer_listener);</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a>(std::unique_ptr&lt;MuxerListener&gt; muxer_listener);</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="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a>(scoped_ptr&lt;ProgressListener&gt; progress_listener);</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a>(std::unique_ptr&lt;ProgressListener&gt; progress_listener);</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> std::vector&lt;MediaStream*&gt;&amp; streams()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> streams_; }</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
@@ -185,8 +185,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  FourCC protection_scheme_;</div>
 <div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  <span class="keywordtype">bool</span> cancelled_;</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;  scoped_ptr&lt;MuxerListener&gt; muxer_listener_;</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  scoped_ptr&lt;ProgressListener&gt; progress_listener_;</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;  std::unique_ptr&lt;MuxerListener&gt; muxer_listener_;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  std::unique_ptr&lt;ProgressListener&gt; progress_listener_;</div>
 <div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="comment">// An external injected clock, can be NULL.</span></div>
 <div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  base::Clock* clock_;</div>
 <div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
@@ -197,22 +197,22 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_BASE_MUXER_H_</span></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a9204fe352d13cea8a367ae9c14e9639e"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">shaka::media::Muxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00082">muxer.cc:82</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a9204fe352d13cea8a367ae9c14e9639e"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">shaka::media::Muxer::Cancel</a></div><div class="ttdeci">void Cancel()</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00084">muxer.cc:84</a></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_1Muxer_html_a0a2dfb3924ce1307f98c339e6587369c"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">shaka::media::Muxer::SetProgressListener</a></div><div class="ttdeci">void SetProgressListener(scoped_ptr&lt; ProgressListener &gt; progress_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00090">muxer.cc:90</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a786fbb91d7ece58c68334f5cef16ae71"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">shaka::media::Muxer::SetMuxerListener</a></div><div class="ttdeci">void SetMuxerListener(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00086">muxer.cc:86</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_ad9479d299d1c494604a5f5a052fe8280"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">shaka::media::Muxer::AddStream</a></div><div class="ttdeci">void AddStream(MediaStream *stream)</div><div class="ttdoc">Add video/audio stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00042">muxer.cc:42</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a021fdae2adc98716b1c8ee7617ab917b"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(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="../../d9/db9/muxer_8cc_source.html#l00029">muxer.cc:29</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_adc96fbcd6a4d4ba9845f8d00974ace0f"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">shaka::media::Muxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdoc">Drive the remuxing from muxer side (pull). </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00048">muxer.cc:48</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_ad9479d299d1c494604a5f5a052fe8280"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#ad9479d299d1c494604a5f5a052fe8280">shaka::media::Muxer::AddStream</a></div><div class="ttdeci">void AddStream(MediaStream *stream)</div><div class="ttdoc">Add video/audio stream. </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00044">muxer.cc:44</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a021fdae2adc98716b1c8ee7617ab917b"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(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="../../d9/db9/muxer_8cc_source.html#l00031">muxer.cc:31</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_adc96fbcd6a4d4ba9845f8d00974ace0f"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">shaka::media::Muxer::Run</a></div><div class="ttdeci">Status Run()</div><div class="ttdoc">Drive the remuxing from muxer side (pull). </div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00050">muxer.cc:50</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1Muxer_html_a25a146d553c385aad70dbff6b3e87eec"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">shaka::media::Muxer::SetProgressListener</a></div><div class="ttdeci">void SetProgressListener(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00092">muxer.cc:92</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_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#l00031">key_source.h:31</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_1Muxer_html_a3cc7feaee9a2c3a7d0569cb9c67c8c68"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68">shaka::media::Muxer::set_clock</a></div><div class="ttdeci">void set_clock(base::Clock *clock)</div><div class="ttdef"><b>Definition:</b> <a href="../../db/df6/muxer_8h_source.html#l00082">muxer.h:82</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 class="ttc" id="classshaka_1_1media_1_1Muxer_html_a0e76dd0a5c07dd538221459365ae824a"><div class="ttname"><a href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">shaka::media::Muxer::SetMuxerListener</a></div><div class="ttdeci">void SetMuxerListener(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</div><div class="ttdef"><b>Definition:</b> <a href="../../d9/db9/muxer_8cc_source.html#l00088">muxer.cc:88</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 22cac0a3f4..f6f7789eeb 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 ce4fd4fad3..06d14f945a 100644
--- a/docs/db/dfb/mpd__utils_8cc_source.html
+++ b/docs/db/dfb/mpd__utils_8cc_source.html
@@ -444,7 +444,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 d28ce464ad..8939255151 100644
--- a/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html
+++ b/docs/db/dfc/mpd__notify__muxer__listener_8cc_source.html
@@ -99,8 +99,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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/media/base/audio_stream_info.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/video_stream_info.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/protection_system_specific_info.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/protection_system_specific_info.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/video_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/event/muxer_listener_internal.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/mpd_notifier.h&quot;</span></div>
@@ -150,7 +150,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <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="l00062"></a><span class="lineno">   62</span>&#160;    uint32_t time_scale,</div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    ContainerType container_type) {</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  scoped_ptr&lt;MediaInfo&gt; media_info(<span class="keyword">new</span> MediaInfo());</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  std::unique_ptr&lt;MediaInfo&gt; media_info(<span class="keyword">new</span> MediaInfo());</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordflow">if</span> (!internal::GenerateMediaInfo(muxer_options,</div>
 <div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;                                   stream_info,</div>
 <div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;                                   time_scale,</div>
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="comment">// TODO(kqyang): Check return result.</span></div>
 <div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    mpd_notifier_-&gt;<a class="code" href="../../d3/dd0/classshaka_1_1MpdNotifier.html#ae10c06fe6022a1020fc889de389be430">NotifyNewContainer</a>(*media_info, &amp;notification_id_);</div>
 <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;    media_info_ = media_info.Pass();</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    media_info_ = std::move(media_info);</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">   86</span>&#160;</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 02c65fd71a..b4aba7b6fc 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2ab1187237..ceb5da0d2d 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 eed4488de9..7795e4164c 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 f464a569b5..85f615406e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 75e40966fc..09080e6cd4 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 0cf34fb32d..4badd46d53 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 44bbee595a..9d93d9e3c4 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 32733ce35e..1c040c4038 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 2015180ff2..ca30507ebc 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 d74ff8b600..e9bc78bf91 100644
--- a/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html
+++ b/docs/dc/d22/dash__iop__mpd__notifier_8cc_source.html
@@ -394,7 +394,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 4a77932261..365146e6ef 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 bb9945d75d..684663dc11 100644
--- a/docs/dc/d3c/webm__cluster__parser_8h_source.html
+++ b/docs/dc/d3c/webm__cluster__parser_8h_source.html
@@ -96,11 +96,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;deque&gt;</span></div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;map&gt;</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;set&gt;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;string&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/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;set&gt;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;string&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/base/compiler_specific.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/decryptor_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_parser.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>
@@ -243,7 +243,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  scoped_refptr&lt;VideoStreamInfo&gt; video_stream_info_;</div>
 <div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  std::set&lt;int64_t&gt; ignored_tracks_;</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;  scoped_ptr&lt;DecryptorSource&gt; decryptor_source_;</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  std::unique_ptr&lt;DecryptorSource&gt; decryptor_source_;</div>
 <div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  std::string audio_encryption_key_id_;</div>
 <div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  std::string video_encryption_key_id_;</div>
 <div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;</div>
@@ -256,12 +256,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">MediaParser::InitCB</a> init_cb_;</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;  int64_t last_block_timecode_ = -1;</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  scoped_ptr&lt;uint8_t[]&gt; block_data_;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; block_data_;</div>
 <div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;  <span class="keywordtype">int</span> block_data_size_ = -1;</div>
 <div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  int64_t block_duration_ = -1;</div>
 <div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  int64_t block_add_id_ = -1;</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;  scoped_ptr&lt;uint8_t[]&gt; block_additional_data_;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; block_additional_data_;</div>
 <div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="comment">// Must be 0 if |block_additional_data_| is null. Must be &gt; 0 if</span></div>
 <div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="comment">// |block_additional_data_| is NOT null.</span></div>
 <div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  <span class="keywordtype">int</span> block_additional_data_size_ = 0;</div>
@@ -288,11 +288,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_</span></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_1WebMClusterParser_html_abe19fd2154084026a514541e152600e0a696e4587c758dc7908ad6bbb376ae06d"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#abe19fd2154084026a514541e152600e0a696e4587c758dc7908ad6bbb376ae06d">shaka::media::WebMClusterParser::kDefaultAudioBufferDurationInMs</a></div><div class="ttdoc">Common 1k samples @44.1kHz. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3c/webm__cluster__parser_8h_source.html#l00030">webm_cluster_parser.h:30</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#l00035">media_parser.h:35</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_1WebMClusterParser_html_a66f87fef54ed47bd36d740254d52b9c7"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#a66f87fef54ed47bd36d740254d52b9c7">shaka::media::WebMClusterParser::cluster_ended</a></div><div class="ttdeci">bool cluster_ended() const </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3c/webm__cluster__parser_8h_source.html#l00151">webm_cluster_parser.h:151</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMClusterParser_html_aba1bae97c2d96181027e43b0a1993e67"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#aba1bae97c2d96181027e43b0a1993e67">shaka::media::WebMClusterParser::Parse</a></div><div class="ttdeci">int Parse(const uint8_t *buf, int size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00090">webm_cluster_parser.cc:90</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMClusterParser_html_ac3d4be1a12667ed722915be727747eee"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#ac3d4be1a12667ed722915be727747eee">shaka::media::WebMClusterParser::Flush</a></div><div class="ttdeci">bool Flush() WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d8f/webm__cluster__parser_8cc_source.html#l00082">webm_cluster_parser.cc:82</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#l00044">media_parser.h:44</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_1WebMClusterParser_html"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html">shaka::media::WebMClusterParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3c/webm__cluster__parser_8h_source.html#l00024">webm_cluster_parser.h:24</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#l00028">webm_cluster_parser.cc:28</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMClusterParser_html_abe19fd2154084026a514541e152600e0ae4ed667d0b90505a42a7983b0aa4d57f"><div class="ttname"><a href="../../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#abe19fd2154084026a514541e152600e0ae4ed667d0b90505a42a7983b0aa4d57f">shaka::media::WebMClusterParser::kDefaultVideoBufferDurationInMs</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d3c/webm__cluster__parser_8h_source.html#l00034">webm_cluster_parser.h:34</a></div></div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0607d8b225..0ed386de0a 100644
--- a/docs/dc/d3f/key__source_8h_source.html
+++ b/docs/dc/d3f/key__source_8h_source.html
@@ -99,77 +99,76 @@ 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;string&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/base/memory/scoped_ptr.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/protection_system_specific_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/status.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="l00020"></a><span class="lineno"><a class="line" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">   20</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> {</div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>();</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;  ~<a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</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;  std::vector&lt;ProtectionSystemSpecificInfo&gt; key_system_info;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  std::vector&lt;uint8_t&gt; key_id;</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  std::vector&lt;uint8_t&gt; key;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  std::vector&lt;uint8_t&gt; iv;</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;</div>
-<div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</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;  <span class="keyword">enum</span> TrackType {</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    TRACK_TYPE_UNKNOWN = 0,</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    TRACK_TYPE_SD = 1,</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    TRACK_TYPE_HD = 2,</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    TRACK_TYPE_AUDIO = 3,</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    TRACK_TYPE_UNSPECIFIED = 4,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;    NUM_VALID_TRACK_TYPES = 4</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;  <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>();</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>();</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) = 0;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;      <span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) = 0;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(uint32_t asset_id) = 0;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;                        <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16">GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                                    TrackType track_type,</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;                                    <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  <span class="keyword">static</span> TrackType <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">GetTrackTypeFromString</a>(<span class="keyword">const</span> std::string&amp; track_type_string);</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">   92</span>&#160;  <span class="keyword">static</span> std::string <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(TrackType track_type);</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">private</span>:</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>);</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 media</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_BASE_KEY_SOURCE_H_</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/protection_system_specific_info.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/status.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"><a class="line" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">   19</a></span>&#160;<span class="keyword">struct </span><a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> {</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;  <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>();</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;  ~<a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>();</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;  std::vector&lt;ProtectionSystemSpecificInfo&gt; key_system_info;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  std::vector&lt;uint8_t&gt; key_id;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;  std::vector&lt;uint8_t&gt; key;</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  std::vector&lt;uint8_t&gt; iv;</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="l00030"></a><span class="lineno"><a class="line" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">   30</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keyword">enum</span> TrackType {</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    TRACK_TYPE_UNKNOWN = 0,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    TRACK_TYPE_SD = 1,</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    TRACK_TYPE_HD = 2,</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    TRACK_TYPE_AUDIO = 3,</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    TRACK_TYPE_UNSPECIFIED = 4,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;    NUM_VALID_TRACK_TYPES = 4</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;  <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>();</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>();</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; pssh_box) = 0;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;      <span class="keyword">const</span> std::vector&lt;std::vector&lt;uint8_t&gt;&gt;&amp; key_ids) = 0;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">FetchKeys</a>(uint32_t asset_id) = 0;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(TrackType track_type, <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3">GetKey</a>(<span class="keyword">const</span> std::vector&lt;uint8_t&gt;&amp; key_id,</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;                        <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16">GetCryptoPeriodKey</a>(uint32_t crypto_period_index,</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;                                    TrackType track_type,</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;                                    <a class="code" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a>* key) = 0;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keyword">static</span> TrackType <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a0963412e7ee33d0e34893ebdf38d96c1">GetTrackTypeFromString</a>(<span class="keyword">const</span> std::string&amp; track_type_string);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keyword">static</span> std::string <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#a4f9cede7a8c1678e1fac93c8fe12aa75">TrackTypeToString</a>(TrackType track_type);</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">private</span>:</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>);</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 media</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_BASE_KEY_SOURCE_H_</span></div>
 <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_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_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_1KeySource_html_aca6ecdac6ebc131d3626b765f64cb2de"><div class="ttname"><a href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html#aca6ecdac6ebc131d3626b765f64cb2de">shaka::media::KeySource::FetchKeys</a></div><div class="ttdeci">virtual Status FetchKeys(const std::vector&lt; uint8_t &gt; &amp;pssh_box)=0</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#l00020">key_source.h:20</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_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#l00031">key_source.h:31</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ecc19f511f..998daf2972 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 98a0c1248c..d067e53cd6 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 032de8c889..2751bdd898 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 7335647005..6af543a739 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 55dc0589f3..f98df47356 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
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 18a1ea8dcb..4ad3c0dd49 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 07af410301..5817ba2130 100644
--- a/docs/dc/d53/webm_2segmenter_8cc_source.html
+++ b/docs/dc/d53/webm_2segmenter_8cc_source.html
@@ -135,7 +135,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;Segmenter::~Segmenter() {}</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="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">   49</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Segmenter::Initialize</a>(scoped_ptr&lt;MkvWriter&gt; writer,</div>
+<div class="line"><a name="l00049"></a><span class="lineno"><a class="line" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">   49</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Segmenter::Initialize</a>(std::unique_ptr&lt;MkvWriter&gt; writer,</div>
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                             <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>* info,</div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                             <a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a>* progress_listener,</div>
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                             <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
@@ -190,7 +190,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordflow">if</span> (!status.ok())</div>
 <div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    <span class="keywordflow">return</span> status;</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="keywordflow">return</span> DoInitialize(writer.Pass());</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordflow">return</span> DoInitialize(std::move(writer));</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="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">  107</a></span>&#160;<a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a464a30159b8888a54254356d191947ac">Segmenter::Finalize</a>() {</div>
@@ -545,7 +545,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1ProgressListener_html_a9c32e569c50194a106f7e9242749e7e7"><div class="ttname"><a href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html#a9c32e569c50194a106f7e9242749e7e7">shaka::media::ProgressListener::OnProgress</a></div><div class="ttdeci">virtual void OnProgress(double progress)=0</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_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#l00031">key_source.h:31</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_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>
@@ -553,7 +553,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 8f3d584bc6..8d2035b5f0 100644
--- a/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html
+++ b/docs/dc/d54/structshaka_1_1media_1_1H264DecRefPicMarking.html
@@ -121,7 +121,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>max_long_term_frame_id
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fa54f47022..7259678f69 100644
--- a/docs/dc/d58/webm__media__parser_8h_source.html
+++ b/docs/dc/d58/webm__media__parser_8h_source.html
@@ -157,7 +157,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">bool</span> unknown_segment_size_;</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;  scoped_ptr&lt;WebMClusterParser&gt; cluster_parser_;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  std::unique_ptr&lt;WebMClusterParser&gt; cluster_parser_;</div>
 <div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <a class="code" href="../../d7/dda/classshaka_1_1media_1_1ByteQueue.html">ByteQueue</a> byte_queue_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html">WebMMediaParser</a>);</div>
@@ -167,19 +167,19 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_</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#l00026">media_parser.h:26</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#l00035">media_parser.h:35</a></div></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_1WebMMediaParser_html_a6c2d4b5b36304831e637f7ae1b9e54a2"><div class="ttname"><a href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html#a6c2d4b5b36304831e637f7ae1b9e54a2">shaka::media::WebMMediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d4/dff/webm__media__parser_8cc_source.html#l00043">webm_media_parser.cc:43</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMMediaParser_html_a40940ec01d965e3a78213861a93f7cfc"><div class="ttname"><a href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html#a40940ec01d965e3a78213861a93f7cfc">shaka::media::WebMMediaParser::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="../../d4/dff/webm__media__parser_8cc_source.html#l00056">webm_media_parser.cc:56</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1WebMMediaParser_html_a5cd5c298938e2c58c45f962b21e43b2e"><div class="ttname"><a href="../../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html#a5cd5c298938e2c58c45f962b21e43b2e">shaka::media::WebMMediaParser::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="../../d4/dff/webm__media__parser_8cc_source.html#l00028">webm_media_parser.cc:28</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_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#l00044">media_parser.h:44</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#l00020">byte_queue.h:20</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#l00031">key_source.h:31</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b0d6f4498c..1123355f77 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 7d67f0cd67..e0f40927e3 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 6dfa1377af..d57400ea0a 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>cluster_length_sec</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>cues</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DoFinalize</b>()=0 (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">pure virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(scoped_ptr&lt; MkvWriter &gt; writer)=0 (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">pure virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(std::unique_ptr&lt; MkvWriter &gt; writer)=0 (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">pure virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a>()</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a66c49dfab5316bea5b7b318871aef129">FromBMFFTimescale</a>(uint64_t time_timescale)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a8de27c5b6480f968cbef9eafec3731d7">FromWebMTimecode</a>(uint64_t time_webm_timecode)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a3a6c1932e6c4894a61eb7230022bceb5">GetIndexRangeStartAndEnd</a>(uint64_t *start, uint64_t *end)=0</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a611b919c82885b6bcfe39a1def78548c">GetInitRangeStartAndEnd</a>(uint64_t *start, uint64_t *end)=0</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>info</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a>(scoped_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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a>(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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>muxer_listener</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>seek_head</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 052d00483f..b6d651a79e 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 ac388eb5e5..94a80d891b 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 e11ae841b1..69f99ec7c9 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9035aac994..1910cb4990 100644
--- a/docs/dc/d7b/h264__parser_8cc_source.html
+++ b/docs/dc/d7b/h264__parser_8cc_source.html
@@ -93,8 +93,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;</div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;packager/media/codecs/h264_parser.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/memory/scoped_ptr.h&quot;</span></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>
@@ -685,7 +685,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;H264Sps&gt; sps(<span class="keyword">new</span> H264Sps());</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>
@@ -807,7 +807,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;H264Pps&gt; pps(<span class="keyword">new</span> H264Pps());</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>
@@ -1264,7 +1264,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 281ae04cab..5619b9f54b 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 307a81684f..228d056e11 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4238d645e8..1c1da78578 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 13958549f4..9575461779 100644
--- a/docs/dc/da1/classshaka_1_1MpdBuilder.html
+++ b/docs/dc/da1/classshaka_1_1MpdBuilder.html
@@ -132,10 +132,10 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:af7eae5cc11141eed2b5451d969e57db6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:adf8a48afbb29f1f1c54e4daaebb81337"><td class="memItemLeft" align="right" valign="top">MpdType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a> () const </td></tr>
 <tr class="separator:adf8a48afbb29f1f1c54e4daaebb81337"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a723afe73b9d619a1178ae21e46fd7450"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a723afe73b9d619a1178ae21e46fd7450"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">InjectClockForTesting</a> (scoped_ptr&lt; base::Clock &gt; clock)</td></tr>
-<tr class="memdesc:a723afe73b9d619a1178ae21e46fd7450"><td class="mdescLeft">&#160;</td><td class="mdescRight">This is for testing. <br/></td></tr>
-<tr class="separator:a723afe73b9d619a1178ae21e46fd7450"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7a4f96f12b589cfc4b5c2f44532eec53"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7a4f96f12b589cfc4b5c2f44532eec53"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a> (std::unique_ptr&lt; base::Clock &gt; clock)</td></tr>
+<tr class="memdesc:a7a4f96f12b589cfc4b5c2f44532eec53"><td class="mdescLeft">&#160;</td><td class="mdescRight">This is for testing. <br/></td></tr>
+<tr class="separator:a7a4f96f12b589cfc4b5c2f44532eec53"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-static-methods"></a>
 Static Public Member Functions</h2></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 0bc486ec0e..2cdde2f98d 100644
--- a/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html
+++ b/docs/dc/da6/classshaka_1_1media_1_1ContentEncoding.html
@@ -176,7 +176,7 @@ Static Public Attributes</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="../../d9/d3b/webm__content__encodings_8h_source.html#l00016">16</a> of file <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html">webm_content_encodings.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html#l00015">15</a> of file <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html">webm_content_encodings.h</a>.</p>
 </div><h2 class="groupheader">Member Data Documentation</h2>
 <a class="anchor" id="a3ba32d5ca8b0688b2dc6b2ec8a5be6d2"></a>
 <div class="memitem">
@@ -197,7 +197,7 @@ Static Public Attributes</h2></td></tr>
 </div><div class="memdoc">
 <p>The following enum definitions are based on the <a class="el" href="../../dc/da6/classshaka_1_1media_1_1ContentEncoding.html">ContentEncoding</a> element specified in the Matroska spec. </p>
 
-<p>Definition at line <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html#l00021">21</a> of file <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html">webm_content_encodings.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html#l00020">20</a> of file <a class="el" href="../../d9/d3b/webm__content__encodings_8h_source.html">webm_content_encodings.h</a>.</p>
 
 </div>
 </div>
@@ -208,7 +208,7 @@ Static Public Attributes</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 74f44b5f7b..ad809b9e0c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 1753a940c6..26560b316c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e7c0fa6845..dd65e0fc3c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 4861789ed7..81780111f0 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 b36385b0a3..b7a4a1d908 100644
--- a/docs/dc/dd9/rsa__key_8cc_source.html
+++ b/docs/dc/dd9/rsa__key_8cc_source.html
@@ -350,7 +350,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 336000a28d..5fb242c24c 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9ea5a71c84..aadc304118 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 84cdfa687a..458afb4ac8 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8001322dfa..bff43e8b58 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ab09a848ae..7f02c7ea89 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 f1a22a5bd0..d0b50e5c41 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 3849d831ce..06393c6707 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1f4a87ef17..cdc8015b0d 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 b749eabd7b..e342ece1fa 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
@@ -112,8 +112,8 @@ Inheritance diagram for shaka::media::mp4::EncryptingFragmenter:</div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a5a331edd7e75f6cd15ccbe9c688440a4"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter</a> (scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> &gt; info, <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *traf, scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *listener)</td></tr>
-<tr class="separator:a5a331edd7e75f6cd15ccbe9c688440a4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3c1c1037b7d9e6edf1f476434705c3d5"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter</a> (scoped_refptr&lt; <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> &gt; info, <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *traf, std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *listener)</td></tr>
+<tr class="separator:a3c1c1037b7d9e6edf1f476434705c3d5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">Fragmenter implementation overrides.</div></td></tr>
 <tr class="memitem:afeb03755fa2e6a53376ae5ceb7440021"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#afeb03755fa2e6a53376ae5ceb7440021">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample) override</td></tr>
 <tr class="separator:afeb03755fa2e6a53376ae5ceb7440021"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -176,9 +176,9 @@ uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>crypt_byte_block</
 <tr class="memitem:a05d4dc71b3853d13c3250ca6572c14d0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a05d4dc71b3853d13c3250ca6572c14d0"></a>
 uint8_t&#160;</td><td class="memItemRight" valign="bottom"><b>skip_byte_block</b> () const </td></tr>
 <tr class="separator:a05d4dc71b3853d13c3250ca6572c14d0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4580cb2195b7c4909ad185abf17a68c8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4580cb2195b7c4909ad185abf17a68c8"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b> (scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
-<tr class="separator:a4580cb2195b7c4909ad185abf17a68c8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a6378d0ec695ff5b84a6b44aad4511383"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6378d0ec695ff5b84a6b44aad4511383"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b> (std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt; encryption_key)</td></tr>
+<tr class="separator:a6378d0ec695ff5b84a6b44aad4511383"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter')"><img src="../../closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td></tr>
 <tr class="memitem:a206f6568b2258fe9bcd271d8590d661d inherit pro_methods_classshaka_1_1media_1_1mp4_1_1Fragmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a206f6568b2258fe9bcd271d8590d661d"></a>
 <a class="el" href="../../df/d7b/structshaka_1_1media_1_1mp4_1_1TrackFragment.html">TrackFragment</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>traf</b> ()</td></tr>
@@ -192,7 +192,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 
 <p>Definition at line <a class="el" href="../../d1/dcb/encrypting__fragmenter_8h_source.html#l00028">28</a> of file <a class="el" href="../../d1/dcb/encrypting__fragmenter_8h_source.html">encrypting_fragmenter.h</a>.</p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="a5a331edd7e75f6cd15ccbe9c688440a4"></a>
+<a class="anchor" id="a3c1c1037b7d9e6edf1f476434705c3d5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -211,7 +211,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html">EncryptionKey</a> &gt;&#160;</td>
           <td class="paramname"><em>encryption_key</em>, </td>
         </tr>
         <tr>
@@ -301,7 +301,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 
 <p>Reimplemented from <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a684c1f318ac05e85f4dbf373ea65b7ad">shaka::media::mp4::Fragmenter</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00102">102</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00106">106</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -328,7 +328,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 <p>Create the encryptor for the internal encryption key. The existing encryptor will be reset if it is not NULL. </p>
 <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="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00204">204</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00208">208</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -364,7 +364,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 
 <p>Reimplemented from <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a">shaka::media::mp4::Fragmenter</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00117">117</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00121">121</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -394,7 +394,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_encryption_key</b
 
 <p>Reimplemented in <a class="el" href="../../d2/d29/classshaka_1_1media_1_1mp4_1_1KeyRotationFragmenter.html#a3bdb3a237cb8eb1484ee98e195d290a7">shaka::media::mp4::KeyRotationFragmenter</a>.</p>
 
-<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00161">161</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html#l00165">165</a> of file <a class="el" href="../../d6/d41/encrypting__fragmenter_8cc_source.html">encrypting_fragmenter.cc</a>.</p>
 
 </div>
 </div>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 493b75bcce..749f560cf5 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>cluster_length_sec</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>cues</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DoFinalize</b>() override (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(scoped_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>DoInitialize</b>(std::unique_ptr&lt; MkvWriter &gt; writer) override (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a>()</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a66c49dfab5316bea5b7b318871aef129">FromBMFFTimescale</a>(uint64_t time_timescale)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a8de27c5b6480f968cbef9eafec3731d7">FromWebMTimecode</a>(uint64_t time_webm_timecode)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -106,7 +106,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#a1708739c73c4565d5dfda6bedffd89a8">GetIndexRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html#ae1395bcb6fb255b2695766c1e85b1aa3">GetInitRangeStartAndEnd</a>(uint64_t *start, uint64_t *end) override</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>info</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a>(scoped_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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a>(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)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>muxer_listener</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>seek_head</b>() (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -116,7 +116,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_index_start</b>(uint64_t start) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>set_init_end</b>(uint64_t end) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_progress_target</b>(uint64_t target) (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_writer</b>(scoped_ptr&lt; MkvWriter &gt; writer) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>set_writer</b>(std::unique_ptr&lt; MkvWriter &gt; writer) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a6060ddc97c58e4435d1db932de17e131">SetCluster</a>(uint64_t start_webm_timecode, uint64_t position, MkvWriter *writer)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>SingleSegmentSegmenter</b>(const MuxerOptions &amp;options) (defined in <a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d3/da1/classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter.html">shaka::media::webm::SingleSegmentSegmenter</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>track_id</b>() const  (defined in <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a>)</td><td class="entry"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 fc04cd9651..44ba70a9cf 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2934d33890..ed57c0b9b7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 c1fa2ea9a0..bb98fbd0c3 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 cf500e7bfd..fa16abc870 100644
--- a/docs/dd/d11/mpd__builder_8cc_source.html
+++ b/docs/dd/d11/mpd__builder_8cc_source.html
@@ -101,13 +101,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;cmath&gt;</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;iterator&gt;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;list&gt;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &lt;string&gt;</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">#include &quot;packager/base/base64.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/base/bind.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/base/files/file_path.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &lt;string&gt;</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="preprocessor">#include &quot;packager/base/base64.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/base/bind.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/base/files/file_path.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/base/logging.h&quot;</span></div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/string_number_conversions.h&quot;</span></div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;packager/base/strings/stringprintf.h&quot;</span></div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;packager/base/synchronization/lock.h&quot;</span></div>
@@ -500,7 +500,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;AdaptationSet&gt; adaptation_set(</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>
@@ -557,7 +557,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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(child.Pass()))</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>
@@ -783,10 +783,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;RepresentationStateChangeListener&gt; listener(</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;  scoped_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, listener.Pass()));</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>
@@ -915,7 +915,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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(child.Pass()))</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="l00832"></a><span class="lineno">  832</span>&#160;</div>
@@ -1121,17 +1121,17 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#ad029323166bb60175a2369c3e887dca0"> 1035</a></span>&#160;<a class="code" href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">Representation::Representation</a>(</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;    scoped_ptr&lt;RepresentationStateChangeListener&gt; state_change_listener)</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_(state_change_listener.Pass()),</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>
@@ -1476,6 +1476,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
@@ -1483,7 +1484,6 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_1Representation_html_ad029323166bb60175a2369c3e887dca0"><div class="ttname"><a href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">shaka::Representation::Representation</a></div><div class="ttdeci">Representation(const MediaInfo &amp;media_info, const MpdOptions &amp;mpd_options, uint32_t representation_id, scoped_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="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>
@@ -1508,7 +1508,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ada05c0f02..7eb5cf5f13 100644
--- a/docs/dd/d12/mpd__writer_8cc_source.html
+++ b/docs/dd/d12/mpd__writer_8cc_source.html
@@ -124,11 +124,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  DashIopMpdNotifierFactory() {}</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  ~DashIopMpdNotifierFactory()<span class="keyword"> override </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;  scoped_ptr&lt;MpdNotifier&gt; Create(DashProfile dash_profile,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                                 <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                                 <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                                 <span class="keyword">const</span> std::string&amp; output_path)<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;MpdNotifier&gt;(<span class="keyword">new</span> DashIopMpdNotifier(</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  std::unique_ptr&lt;MpdNotifier&gt; Create(DashProfile dash_profile,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                                      <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                                      <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                                      <span class="keyword">const</span> std::string&amp; output_path)<span class="keyword"> override </span>{</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;MpdNotifier&gt;(<span class="keyword">new</span> DashIopMpdNotifier(</div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;        dash_profile, mpd_options, base_urls, output_path));</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>
@@ -139,11 +139,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  SimpleMpdNotifierFactory() {}</div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  ~SimpleMpdNotifierFactory()<span class="keyword"> override </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;  scoped_ptr&lt;MpdNotifier&gt; Create(DashProfile dash_profile,</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                                 <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                                 <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                                 <span class="keyword">const</span> std::string&amp; output_path)<span class="keyword"> override </span>{</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordflow">return</span> scoped_ptr&lt;MpdNotifier&gt;(<span class="keyword">new</span> SimpleMpdNotifier(</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  std::unique_ptr&lt;MpdNotifier&gt; Create(DashProfile dash_profile,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                                      <span class="keyword">const</span> MpdOptions&amp; mpd_options,</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                                      <span class="keyword">const</span> std::vector&lt;std::string&gt;&amp; base_urls,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                                      <span class="keyword">const</span> std::string&amp; output_path)<span class="keyword"> override </span>{</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordflow">return</span> std::unique_ptr&lt;MpdNotifier&gt;(<span class="keyword">new</span> SimpleMpdNotifier(</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        dash_profile, mpd_options, base_urls, output_path));</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>
@@ -185,7 +185,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="keywordtype">bool</span> MpdWriter::WriteMpdToFile(<span class="keyword">const</span> <span class="keywordtype">char</span>* file_name) {</div>
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  CHECK(file_name);</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  scoped_ptr&lt;MpdNotifier&gt; notifier = notifier_factory_-&gt;Create(</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  std::unique_ptr&lt;MpdNotifier&gt; notifier = notifier_factory_-&gt;Create(</div>
 <div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      kOnDemandProfile, MpdOptions(), base_urls_, file_name);</div>
 <div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="keywordflow">if</span> (!notifier-&gt;Init()) {</div>
 <div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    LOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;failed to initialize MpdNotifier.&quot;</span>;</div>
@@ -211,17 +211,17 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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> MpdWriter::SetMpdNotifierFactoryForTest(</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    scoped_ptr&lt;MpdNotifierFactory&gt; factory) {</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  notifier_factory_ = factory.Pass();</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    std::unique_ptr&lt;MpdNotifierFactory&gt; factory) {</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  notifier_factory_ = std::move(factory);</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="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_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#l00189">file.cc:189</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#l00186">file.cc:186</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 ba211438c5..35fe38b96a 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 93dfac81ec..f420c9b13a 100644
--- a/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html
+++ b/docs/dd/d17/classshaka_1_1media_1_1Demuxer.html
@@ -101,8 +101,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 Public Member Functions</h2></td></tr>
 <tr class="memitem:ae2fee69f99e5815de4f686b24393402e"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">Demuxer</a> (const std::string &amp;file_name)</td></tr>
 <tr class="separator:ae2fee69f99e5815de4f686b24393402e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:acad9afa8ef3b5682324a4ded402ab93a"><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#acad9afa8ef3b5682324a4ded402ab93a">SetKeySource</a> (scoped_ptr&lt; <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> &gt; key_source)</td></tr>
-<tr class="separator:acad9afa8ef3b5682324a4ded402ab93a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:abfcf3a9a3f64c0e27497c72324049a1e"><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#abfcf3a9a3f64c0e27497c72324049a1e">SetKeySource</a> (std::unique_ptr&lt; <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> &gt; key_source)</td></tr>
+<tr class="separator:abfcf3a9a3f64c0e27497c72324049a1e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a436ed9fd2a3ddd78056ec7cf656fd9ad"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad">Initialize</a> ()</td></tr>
 <tr class="separator:a436ed9fd2a3ddd78056ec7cf656fd9ad"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9e0b4a430603fdf4639c2153622ae1a2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2">Run</a> ()</td></tr>
@@ -237,14 +237,14 @@ Public Member Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="acad9afa8ef3b5682324a4ded402ab93a"></a>
+<a class="anchor" id="abfcf3a9a3f64c0e27497c72324049a1e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void shaka::media::Demuxer::SetKeySource </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> &gt;&#160;</td>
           <td class="paramname"><em>key_source</em></td><td>)</td>
           <td></td>
         </tr>
@@ -295,7 +295,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 77389fafe3..654b2bb713 100644
--- a/docs/dd/d18/es__parser__adts_8h_source.html
+++ b/docs/dd/d18/es__parser__adts_8h_source.html
@@ -95,11 +95,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &lt;list&gt;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;utility&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/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;utility&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/callback.h&quot;</span></div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.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/byte_queue.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/es_parser.h&quot;</span></div>
@@ -154,7 +154,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  EsPtsList pts_list_;</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">// Interpolated PTS for frames that don&#39;t have one.</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  scoped_ptr&lt;AudioTimestampHelper&gt; audio_timestamp_helper_;</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;  std::unique_ptr&lt;AudioTimestampHelper&gt; audio_timestamp_helper_;</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;  scoped_refptr&lt;StreamInfo&gt; last_audio_decoder_config_;</div>
 <div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
@@ -167,12 +167,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="preprocessor">#endif</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1EsParserAdts_html"><div class="ttname"><a href="../../d6/dcf/classshaka_1_1media_1_1mp2t_1_1EsParserAdts.html">shaka::media::mp2t::EsParserAdts</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d18/es__parser__adts_8h_source.html#l00025">es_parser_adts.h:25</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#l00020">byte_queue.h:20</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_1mp2t_1_1EsParser_html"><div class="ttname"><a href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/deb/es__parser_8h_source.html#l00021">es_parser.h:21</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 589dc4cb27..45eca7f6d0 100644
--- a/docs/dd/d19/video__stream__info_8cc_source.html
+++ b/docs/dd/d19/video__stream__info_8cc_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 877a432166..9953cc5045 100644
--- a/docs/dd/d30/wvm__media__parser_8cc_source.html
+++ b/docs/dd/d30/wvm__media__parser_8cc_source.html
@@ -1223,7 +1223,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l01134"></a><span class="lineno"> 1134</span>&#160;  std::vector&lt;uint8_t&gt; decrypted_content_key_vec(</div>
 <div class="line"><a name="l01135"></a><span class="lineno"> 1135</span>&#160;      content_key_buffer.begin() + 4,</div>
 <div class="line"><a name="l01136"></a><span class="lineno"> 1136</span>&#160;      content_key_buffer.begin() + 20);</div>
-<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;  scoped_ptr&lt;AesCbcDecryptor&gt; content_decryptor(</div>
+<div class="line"><a name="l01137"></a><span class="lineno"> 1137</span>&#160;  std::unique_ptr&lt;AesCbcDecryptor&gt; content_decryptor(</div>
 <div class="line"><a name="l01138"></a><span class="lineno"> 1138</span>&#160;      <span class="keyword">new</span> AesCbcDecryptor(kCtsPadding, AesCryptor::kUseConstantIv));</div>
 <div class="line"><a name="l01139"></a><span class="lineno"> 1139</span>&#160;  <span class="keywordflow">if</span> (!content_decryptor-&gt;InitializeWithIv(decrypted_content_key_vec,</div>
 <div class="line"><a name="l01140"></a><span class="lineno"> 1140</span>&#160;                                           zero_iv)) {</div>
@@ -1231,7 +1231,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l01142"></a><span class="lineno"> 1142</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
 <div class="line"><a name="l01143"></a><span class="lineno"> 1143</span>&#160;  }</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;  content_decryptor_ = content_decryptor.Pass();</div>
+<div class="line"><a name="l01145"></a><span class="lineno"> 1145</span>&#160;  content_decryptor_ = std::move(content_decryptor);</div>
 <div class="line"><a name="l01146"></a><span class="lineno"> 1146</span>&#160;  <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;</div>
@@ -1261,12 +1261,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l01172"></a><span class="lineno"> 1172</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1AdtsHeader_html_a149fb9c7fa2718d719008af2dce8157f"><div class="ttname"><a href="../../d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html#a149fb9c7fa2718d719008af2dce8157f">shaka::media::mp2t::AdtsHeader::GetAdtsFrameSize</a></div><div class="ttdeci">static size_t GetAdtsFrameSize(const uint8_t *data, size_t num_bytes)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d5b/adts__header_8cc_source.html#l00023">adts_header.cc:23</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1AudioStreamInfo_html_aee79e7aa61b741bb96f451c6de1c9d42"><div class="ttname"><a href="../../da/d4e/classshaka_1_1media_1_1AudioStreamInfo.html#aee79e7aa61b741bb96f451c6de1c9d42">shaka::media::AudioStreamInfo::GetCodecString</a></div><div class="ttdeci">static std::string GetCodecString(Codec codec, uint8_t audio_object_type)</div><div class="ttdef"><b>Definition:</b> <a href="../../da/d04/audio__stream__info_8cc_source.html#l00095">audio_stream_info.cc:95</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#l00031">key_source.h:31</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_1MediaSample_html_a59e7bbd2ee8cfa1697093d14d16a6c4d"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d">shaka::media::MediaSample::CreateEmptyMediaSample</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CreateEmptyMediaSample()</div><div class="ttdoc">Create a MediaSample object with default members. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00074">media_sample.cc:74</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8c7a5716e8..0b168d7e5a 100644
--- a/docs/dd/d3b/mp4_2segmenter_8h_source.html
+++ b/docs/dd/d3b/mp4_2segmenter_8h_source.html
@@ -97,10 +97,10 @@ 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_FORMATS_MP4_SEGMENTER_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/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</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;<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/base/memory/ref_counted.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/fourccs.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/status.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/mp4/box_definitions.h&quot;</span></div>
@@ -124,8 +124,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00041"></a><span class="lineno"><a class="line" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">   41</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">Segmenter</a> {</div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160; <span class="keyword">public</span>:</div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">Segmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;            scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;            scoped_ptr&lt;Movie&gt; moov);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;            std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;            std::unique_ptr&lt;Movie&gt; moov);</div>
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">Segmenter</a>();</div>
 <div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Initialize</a>(<span class="keyword">const</span> std::vector&lt;MediaStream*&gt;&amp; streams,</div>
@@ -179,11 +179,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  Status FinalizeFragment(<span class="keywordtype">bool</span> finalize_segment, Fragmenter* fragment);</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="keyword">const</span> MuxerOptions&amp; options_;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  scoped_ptr&lt;FileType&gt; ftyp_;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  scoped_ptr&lt;Movie&gt; moov_;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;  scoped_ptr&lt;MovieFragment&gt; moof_;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;  scoped_ptr&lt;BufferWriter&gt; fragment_buffer_;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  scoped_ptr&lt;SegmentIndex&gt; sidx_;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  std::unique_ptr&lt;FileType&gt; ftyp_;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  std::unique_ptr&lt;Movie&gt; moov_;</div>
+<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="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>
@@ -213,7 +213,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#l00031">key_source.h:31</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_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>
@@ -221,7 +221,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 ecd758b35b..323b07baa7 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4b45fbe8d8..fe2c6ccffe 100644
--- a/docs/dd/d42/encryptor_8h_source.html
+++ b/docs/dd/d42/encryptor_8h_source.html
@@ -96,69 +96,72 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_ENCRYPTOR_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_ENCRYPTOR_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 &quot;packager/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/status.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/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/codecs/vpx_parser.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/muxer_listener.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/third_party/libwebm/src/mkvmuxer.hpp&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>AesCtrEncryptor;</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="keyword">class </span>MediaSample;</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>webm {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">   29</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a> {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;  <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a>();</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  ~<a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a>();</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f">Initialize</a>(<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;                    KeySource::TrackType track_type,</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                    Codec codec,</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                    <span class="keywordtype">bool</span> webm_subsample_encryption);</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a866bb619cd0fde0c28ee522cbd4a8c59">AddTrackInfo</a>(mkvmuxer::Track* track);</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c">EncryptFrame</a>(scoped_refptr&lt;MediaSample&gt; sample,</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                      <span class="keywordtype">bool</span> encrypt_frame);</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">private</span>:</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// Create the encryptor for the internal encryption key.</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> CreateEncryptor(<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                         KeySource::TrackType track_type,</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                         Codec codec,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;                         <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                         <span class="keywordtype">bool</span> webm_subsample_encryption);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  scoped_ptr&lt;EncryptionKey&gt; key_;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  scoped_ptr&lt;AesCtrEncryptor&gt; encryptor_;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  scoped_ptr&lt;VPxParser&gt; vpx_parser_;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;};</div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/macros.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/status.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/codecs/vpx_parser.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/media/event/muxer_listener.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/third_party/libwebm/src/mkvmuxer.hpp&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;<span class="keyword">namespace </span>media {</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">class </span>AesCtrEncryptor;</div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">class </span>MediaSample;</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>webm {</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
+<div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">   30</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a> {</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a>();</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  ~<a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</a>();</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f">Initialize</a>(<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;                    KeySource::TrackType track_type,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;                    Codec codec,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;                    <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;                    <span class="keywordtype">bool</span> webm_subsample_encryption);</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a866bb619cd0fde0c28ee522cbd4a8c59">AddTrackInfo</a>(mkvmuxer::Track* track);</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c">EncryptFrame</a>(scoped_refptr&lt;MediaSample&gt; sample,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                      <span class="keywordtype">bool</span> encrypt_frame);</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="keyword">private</span>:</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// Create the encryptor for the internal encryption key.</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> CreateEncryptor(<a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;                         KeySource::TrackType track_type,</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;                         Codec codec,</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;                         <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* key_source,</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;                         <span class="keywordtype">bool</span> webm_subsample_encryption);</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="keyword">private</span>:</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; key_;</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  std::unique_ptr&lt;AesCtrEncryptor&gt; encryptor_;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  std::unique_ptr&lt;VPxParser&gt; vpx_parser_;</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">// namespace webm</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_ENCRYPTOR_H_</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">Encryptor</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;</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;}  <span class="comment">// namespace webm</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_ENCRYPTOR_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Encryptor_html_a866bb619cd0fde0c28ee522cbd4a8c59"><div class="ttname"><a href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a866bb619cd0fde0c28ee522cbd4a8c59">shaka::media::webm::Encryptor::AddTrackInfo</a></div><div class="ttdeci">Status AddTrackInfo(mkvmuxer::Track *track)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/d98/encryptor_8cc_source.html#l00071">encryptor.cc:71</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="classshaka_1_1media_1_1webm_1_1Encryptor_html"><div class="ttname"><a href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">shaka::media::webm::Encryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d42/encryptor_8h_source.html#l00029">encryptor.h:29</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1webm_1_1Encryptor_html"><div class="ttname"><a href="../../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html">shaka::media::webm::Encryptor</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d42/encryptor_8h_source.html#l00030">encryptor.h:30</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>
 <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#l00031">key_source.h:31</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9d55fd9e36..9bd635c9f9 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a9ccdb33e6..4c12b6d967 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 a141a3486c..f636848ce8 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 82478a922a..1b34edd92b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d9db34d313..b0b29799ce 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
@@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EmitSampleCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParser</b>(uint32_t pid) (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>EsParserH265</b>(uint32_t pid, const NewStreamInfoCB &amp;new_stream_info_cb, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html">shaka::media::mp2t::EsParserH265</a>)</td><td class="entry"><a class="el" href="../../d5/d63/classshaka_1_1media_1_1mp2t_1_1EsParserH265.html">shaka::media::mp2t::EsParserH265</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, scoped_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>EsParserH26x</b>(Nalu::CodecType type, std::unique_ptr&lt; H26xByteToUnitStreamConverter &gt; stream_converter, uint32_t pid, const EmitSampleCB &amp;emit_sample_cb) (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Flush</b>() override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>NewStreamInfoCB</b> typedef (defined in <a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a>)</td><td class="entry"><a class="el" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">shaka::media::mp2t::EsParser</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Parse</b>(const uint8_t *buf, int size, int64_t pts, int64_t dts) override (defined in <a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a>)</td><td class="entry"><a class="el" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">shaka::media::mp2t::EsParserH26x</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 2a6748cc36..7c70f434ec 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 19645e2849..98cfa41bf4 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 d06d80eee1..6a85862923 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ba36ed6af9..6b93bafb15 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 e10ec63b5e..1aad267849 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 b06502e8d4..263cc5fec1 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 7471e846a9..6ed7b238f6 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 a65282f930..c0788b3617 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 fd82cfa508..380b2eb2ae 100644
--- a/docs/dd/d80/media__sample_8h_source.html
+++ b/docs/dd/d80/media__sample_8h_source.html
@@ -102,165 +102,164 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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/base/logging.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/memory/scoped_ptr.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/d6d/classshaka_1_1media_1_1MediaSample.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> : <span class="keyword">public</span> base::RefCountedThreadSafe&lt;MediaSample&gt; {</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="l00029"></a><span class="lineno">   29</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">CopyFrom</a>(<span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                                             <span class="keywordtype">size_t</span> size,</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;                                             <span class="keywordtype">bool</span> is_key_frame);</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">CopyFrom</a>(<span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                                             <span class="keywordtype">size_t</span> size,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                                             <span class="keyword">const</span> uint8_t* side_data,</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                                             <span class="keywordtype">size_t</span> side_data_size,</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;                                             <span class="keywordtype">bool</span> is_key_frame);</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a1d23b68125525a019bde262e4c5a46f0">FromMetadata</a>(<span class="keyword">const</span> uint8_t* metadata,</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                                                 <span class="keywordtype">size_t</span> metadata_size);</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">   58</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d">CreateEmptyMediaSample</a>();</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">CreateEOSBuffer</a>();</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;  int64_t dts()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    <span class="keywordflow">return</span> dts_;</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="keywordtype">void</span> set_dts(int64_t dts) { dts_ = dts; }</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;  int64_t pts()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    <span class="keywordflow">return</span> pts_;</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;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordtype">void</span> set_pts(int64_t pts) { pts_ = pts; }</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;  int64_t duration()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keywordflow">return</span> duration_;</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> set_duration(int64_t duration) {</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    duration_ = duration;</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="keywordtype">bool</span> is_key_frame()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="keywordflow">return</span> is_key_frame_;</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> is_encrypted()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="keywordflow">return</span> is_encrypted_;</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="keyword">const</span> uint8_t* data()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    <span class="keywordflow">return</span> &amp;data_[0];</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;  uint8_t* writable_data() {</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    <span class="keywordflow">return</span> &amp;data_[0];</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="keywordtype">size_t</span> data_size()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    DCHECK(!end_of_stream());</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="keywordflow">return</span> data_.size();</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="keyword">const</span> uint8_t* side_data()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <span class="keywordflow">return</span> &amp;side_data_[0];</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">size_t</span> side_data_size()<span class="keyword"> const </span>{</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;    <span class="keywordflow">return</span> side_data_.size();</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> set_data(<span class="keyword">const</span> uint8_t* data, <span class="keyword">const</span> <span class="keywordtype">size_t</span> data_size) {</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    data_.assign(data, data + data_size);</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> resize_data(<span class="keyword">const</span> <span class="keywordtype">size_t</span> data_size) {</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;    data_.resize(data_size);</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> set_is_key_frame(<span class="keywordtype">bool</span> value) {</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;    is_key_frame_ = value;</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> set_is_encrypted(<span class="keywordtype">bool</span> value) {</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    is_encrypted_ = value;</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">// If there&#39;s no data in this buffer, it represents end of stream.</span></div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;  <span class="keywordtype">bool</span> end_of_stream()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.size() == 0; }</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="keyword">const</span> std::string&amp; config_id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> config_id_; }</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordtype">void</span> set_config_id(<span class="keyword">const</span> std::string&amp; config_id) {</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;    config_id_ = config_id;</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="l00146"></a><span class="lineno">  146</span>&#160;  std::string <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#aa3cbd9fee3a228403c3128be5141a614">ToString</a>() <span class="keyword">const</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="keyword">private</span>:</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>base::RefCountedThreadSafe&lt;MediaSample&gt;;</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="comment">// Create a MediaSample. Buffer will be padded and aligned as necessary.</span></div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  <span class="comment">// |data|,|side_data| can be NULL, which indicates an empty sample.</span></div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  <span class="comment">// |size|,|side_data_size| should not be negative.</span></div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;  MediaSample(<span class="keyword">const</span> uint8_t* data,</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;              <span class="keywordtype">size_t</span> size,</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;              <span class="keyword">const</span> uint8_t* side_data,</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;              <span class="keywordtype">size_t</span> side_data_size,</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;              <span class="keywordtype">bool</span> is_key_frame);</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  MediaSample();</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keyword">virtual</span> ~MediaSample();</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;  <span class="comment">// Decoding time stamp.</span></div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  int64_t dts_;</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="comment">// Presentation time stamp.</span></div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  int64_t pts_;</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  int64_t duration_;</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordtype">bool</span> is_key_frame_;</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="comment">// is sample encrypted ?</span></div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keywordtype">bool</span> is_encrypted_;</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="comment">// Main buffer data.</span></div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  std::vector&lt;uint8_t&gt; data_;</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="comment">// Contain additional buffers to complete the main one. Needed by WebM</span></div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="comment">// http://www.matroska.org/technical/specs/index.html BlockAdditional[A5].</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  <span class="comment">// Not used by mp4 and other containers.</span></div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;  std::vector&lt;uint8_t&gt; side_data_;</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">// Text specific fields.</span></div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  <span class="comment">// For now this is the cue identifier for WebVTT.</span></div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  std::string config_id_;</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;  DISALLOW_COPY_AND_ASSIGN(MediaSample);</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">  185</span>&#160;<span class="keyword">typedef</span> std::deque&lt;scoped_refptr&lt;MediaSample&gt; &gt; BufferQueue;</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="comment">// namespace media</span></div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;}  <span class="comment">// namespace shaka</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="preprocessor">#endif  // MEDIA_BASE_MEDIA_SAMPLE_H_</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/d6d/classshaka_1_1media_1_1MediaSample.html">   21</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> : <span class="keyword">public</span> base::RefCountedThreadSafe&lt;MediaSample&gt; {</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="l00028"></a><span class="lineno">   28</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">CopyFrom</a>(<span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;                                             <span class="keywordtype">size_t</span> size,</div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;                                             <span class="keywordtype">bool</span> is_key_frame);</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">CopyFrom</a>(<span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;                                             <span class="keywordtype">size_t</span> size,</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                                             <span class="keyword">const</span> uint8_t* side_data,</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                                             <span class="keywordtype">size_t</span> side_data_size,</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;                                             <span class="keywordtype">bool</span> is_key_frame);</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keyword">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a1d23b68125525a019bde262e4c5a46f0">FromMetadata</a>(<span class="keyword">const</span> uint8_t* metadata,</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                                                 <span class="keywordtype">size_t</span> metadata_size);</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">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d">CreateEmptyMediaSample</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">static</span> scoped_refptr&lt;MediaSample&gt; <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">CreateEOSBuffer</a>();</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;  int64_t dts()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keywordflow">return</span> dts_;</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;  <span class="keywordtype">void</span> set_dts(int64_t dts) { dts_ = dts; }</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;  int64_t pts()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keywordflow">return</span> pts_;</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;</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">void</span> set_pts(int64_t pts) { pts_ = pts; }</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;  int64_t duration()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;    <span class="keywordflow">return</span> duration_;</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">void</span> set_duration(int64_t duration) {</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    duration_ = duration;</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> is_key_frame()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    <span class="keywordflow">return</span> is_key_frame_;</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> is_encrypted()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    <span class="keywordflow">return</span> is_encrypted_;</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="keyword">const</span> uint8_t* data()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    <span class="keywordflow">return</span> &amp;data_[0];</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">  102</span>&#160;  uint8_t* writable_data() {</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="keywordflow">return</span> &amp;data_[0];</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;  <span class="keywordtype">size_t</span> data_size()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    DCHECK(!end_of_stream());</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="keywordflow">return</span> data_.size();</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="keyword">const</span> uint8_t* side_data()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    <span class="keywordflow">return</span> &amp;side_data_[0];</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="keywordtype">size_t</span> side_data_size()<span class="keyword"> const </span>{</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;    <span class="keywordflow">return</span> side_data_.size();</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;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordtype">void</span> set_data(<span class="keyword">const</span> uint8_t* data, <span class="keyword">const</span> <span class="keywordtype">size_t</span> data_size) {</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    data_.assign(data, data + data_size);</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> resize_data(<span class="keyword">const</span> <span class="keywordtype">size_t</span> data_size) {</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;    data_.resize(data_size);</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">void</span> set_is_key_frame(<span class="keywordtype">bool</span> value) {</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    is_key_frame_ = value;</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="keywordtype">void</span> set_is_encrypted(<span class="keywordtype">bool</span> value) {</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;    is_encrypted_ = value;</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="comment">// If there&#39;s no data in this buffer, it represents end of stream.</span></div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordtype">bool</span> end_of_stream()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.size() == 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="keyword">const</span> std::string&amp; config_id()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> config_id_; }</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordtype">void</span> set_config_id(<span class="keyword">const</span> std::string&amp; config_id) {</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    config_id_ = config_id;</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="l00145"></a><span class="lineno">  145</span>&#160;  std::string <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#aa3cbd9fee3a228403c3128be5141a614">ToString</a>() <span class="keyword">const</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; <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>base::RefCountedThreadSafe&lt;MediaSample&gt;;</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="comment">// Create a MediaSample. Buffer will be padded and aligned as necessary.</span></div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="comment">// |data|,|side_data| can be NULL, which indicates an empty sample.</span></div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;  <span class="comment">// |size|,|side_data_size| should not be negative.</span></div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;  MediaSample(<span class="keyword">const</span> uint8_t* data,</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;              <span class="keywordtype">size_t</span> size,</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;              <span class="keyword">const</span> uint8_t* side_data,</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;              <span class="keywordtype">size_t</span> side_data_size,</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;              <span class="keywordtype">bool</span> is_key_frame);</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;  MediaSample();</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="keyword">virtual</span> ~MediaSample();</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="comment">// Decoding time stamp.</span></div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  int64_t dts_;</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="comment">// Presentation time stamp.</span></div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  int64_t pts_;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  int64_t duration_;</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordtype">bool</span> is_key_frame_;</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="comment">// is sample encrypted ?</span></div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;  <span class="keywordtype">bool</span> is_encrypted_;</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="comment">// Main buffer data.</span></div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  std::vector&lt;uint8_t&gt; data_;</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="comment">// Contain additional buffers to complete the main one. Needed by WebM</span></div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;  <span class="comment">// http://www.matroska.org/technical/specs/index.html BlockAdditional[A5].</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;  <span class="comment">// Not used by mp4 and other containers.</span></div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;  std::vector&lt;uint8_t&gt; side_data_;</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">// Text specific fields.</span></div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  <span class="comment">// For now this is the cue identifier for WebVTT.</span></div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;  std::string config_id_;</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;  DISALLOW_COPY_AND_ASSIGN(MediaSample);</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="keyword">typedef</span> std::deque&lt;scoped_refptr&lt;MediaSample&gt; &gt; BufferQueue;</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">// namespace media</span></div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;}  <span class="comment">// namespace shaka</span></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="preprocessor">#endif  // MEDIA_BASE_MEDIA_SAMPLE_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1MediaSample_html_a1d23b68125525a019bde262e4c5a46f0"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a1d23b68125525a019bde262e4c5a46f0">shaka::media::MediaSample::FromMetadata</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; FromMetadata(const uint8_t *metadata, size_t metadata_size)</div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00067">media_sample.cc:67</a></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_1MediaSample_html_aa3cbd9fee3a228403c3128be5141a614"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#aa3cbd9fee3a228403c3128be5141a614">shaka::media::MediaSample::ToString</a></div><div class="ttdeci">std::string ToString() const </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00084">media_sample.cc:84</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1MediaSample_html"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">shaka::media::MediaSample</a></div><div class="ttdoc">Class to hold a media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d80/media__sample_8h_source.html#l00022">media_sample.h:22</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1MediaSample_html"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">shaka::media::MediaSample</a></div><div class="ttdoc">Class to hold a media sample. </div><div class="ttdef"><b>Definition:</b> <a href="../../dd/d80/media__sample_8h_source.html#l00021">media_sample.h:21</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_1MediaSample_html_a59e7bbd2ee8cfa1697093d14d16a6c4d"><div class="ttname"><a href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d">shaka::media::MediaSample::CreateEmptyMediaSample</a></div><div class="ttdeci">static scoped_refptr&lt; MediaSample &gt; CreateEmptyMediaSample()</div><div class="ttdoc">Create a MediaSample object with default members. </div><div class="ttdef"><b>Definition:</b> <a href="../../d8/d0d/media__sample_8cc_source.html#l00074">media_sample.cc:74</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 33b9e717b3..b93246659a 100644
--- a/docs/dd/d87/memory__file_8cc_source.html
+++ b/docs/dd/d87/memory__file_8cc_source.html
@@ -98,9 +98,9 @@ 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;string.h&gt;</span>  <span class="comment">// for memcpy</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 &lt;map&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/logging.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;memory&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/base/logging.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>
@@ -133,13 +133,13 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  FileSystem() {}</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">static</span> scoped_ptr&lt;FileSystem&gt; g_file_system_;</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;  <span class="keyword">static</span> std::unique_ptr&lt;FileSystem&gt; g_file_system_;</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;  std::map&lt;std::string, std::vector&lt;uint8_t&gt; &gt; files_;</div>
 <div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  DISALLOW_COPY_AND_ASSIGN(FileSystem);</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;scoped_ptr&lt;FileSystem&gt; FileSystem::g_file_system_;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;std::unique_ptr&lt;FileSystem&gt; FileSystem::g_file_system_;</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</span></div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
@@ -241,7 +241,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9a2d6a7c18..ae5f60a09d 100644
--- a/docs/dd/d88/pes__packet__generator_8h_source.html
+++ b/docs/dd/d88/pes__packet__generator_8h_source.html
@@ -97,8 +97,8 @@ 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 PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_GENERATOR_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;list&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/memory/scoped_ptr.h&quot;</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>
@@ -125,11 +125,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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#a346abd50baa9a1e6e42a49ba60f5f916">SetEncryptionKey</a>(scoped_ptr&lt;EncryptionKey&gt; encryption_key);</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> scoped_ptr&lt;PesPacket&gt; <a class="code" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">GetNextPesPacket</a>();</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>
@@ -142,18 +142,18 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;NalUnitToByteStreamConverter&gt; converter_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  scoped_ptr&lt;AACAudioSpecificConfig&gt; adts_converter_;</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;  scoped_ptr&lt;PesPacket&gt; current_processing_pes_;</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;  scoped_ptr&lt;AesCryptor&gt; encryptor_;</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>
@@ -165,16 +165,16 @@ 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  // 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="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_a9834c58c732715a51c57a2a6385a761b"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">shaka::media::mp2t::PesPacketGenerator::GetNextPesPacket</a></div><div class="ttdeci">virtual scoped_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_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>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a346abd50baa9a1e6e42a49ba60f5f916"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">shaka::media::mp2t::PesPacketGenerator::SetEncryptionKey</a></div><div class="ttdeci">virtual bool SetEncryptionKey(scoped_ptr&lt; EncryptionKey &gt; encryption_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00182">pes_packet_generator.cc:182</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a27a700967eb692a8207fd5054263fc3a"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a27a700967eb692a8207fd5054263fc3a">shaka::media::mp2t::PesPacketGenerator::NumberOfReadyPesPackets</a></div><div class="ttdeci">virtual size_t NumberOfReadyPesPackets()</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00206">pes_packet_generator.cc:206</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_aa0346189f99b2f0fc2c71da1543155fa"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa">shaka::media::mp2t::PesPacketGenerator::Initialize</a></div><div class="ttdeci">virtual bool Initialize(const StreamInfo &amp;stream)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00093">pes_packet_generator.cc:93</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_acc603c661a6e0c592091b8bde5a77e3a"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">shaka::media::mp2t::PesPacketGenerator::SetEncryptionKey</a></div><div class="ttdeci">virtual bool SetEncryptionKey(std::unique_ptr&lt; EncryptionKey &gt; encryption_key)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00182">pes_packet_generator.cc:182</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator_html_a72fdec2c03caf45fe447f61ecd4fd683"><div class="ttname"><a href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a72fdec2c03caf45fe447f61ecd4fd683">shaka::media::mp2t::PesPacketGenerator::PushSample</a></div><div class="ttdeci">virtual bool PushSample(scoped_refptr&lt; MediaSample &gt; sample)</div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dee/pes__packet__generator_8cc_source.html#l00127">pes_packet_generator.cc:127</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9fd72fc368..133a330dfa 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 3cc05973d9..edaba9c3e3 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 00e3070508..759eb0db8a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4a3796e2f9..0aeb794270 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 388cc23baa..f130b01735 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 0d9dabcf68..01dc289b98 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 36e045a5fd..9f978ea93c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f82b8d2429..08b91c0c67 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
@@ -111,9 +111,9 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:afa33a0b1578d67411484d64579ef72d1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afa33a0b1578d67411484d64579ef72d1"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>TwoPassSingleSegmentSegmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options)</td></tr>
 <tr class="separator:afa33a0b1578d67411484d64579ef72d1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0db00ae5c2f80c41aa09fa83454767ca"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0db00ae5c2f80c41aa09fa83454767ca"></a>
-<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
-<tr class="separator:a0db00ae5c2f80c41aa09fa83454767ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5d9fef53f3e3163702078188c01d8df9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5d9fef53f3e3163702078188c01d8df9"></a>
+<a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer) override</td></tr>
+<tr class="separator:a5d9fef53f3e3163702078188c01d8df9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac902635838b099b82d486cb9a03e4ec0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac902635838b099b82d486cb9a03e4ec0"></a>
 <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoFinalize</b> () override</td></tr>
 <tr class="separator:ac902635838b099b82d486cb9a03e4ec0"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -129,8 +129,8 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a40ef2af1da328cfdeefe37ef007146bb"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options)</td></tr>
 <tr class="separator:a40ef2af1da328cfdeefe37ef007146bb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
-<tr class="separator:a144b19be7c3f693b06da2fbe2e40587a inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
+<tr class="separator:aa6b32c805c4e662d97244531723ce9eb inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a> ()</td></tr>
 <tr class="separator:aa84782877f1afaf9519a552ac3d5d417 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa15ccabe1a33c660201ef1d8386067e5 inherit pub_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
@@ -153,9 +153,9 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>set_index_start</b> (
 <tr class="memitem:a4111e941d518e7736f98584f2ece4707 inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4111e941d518e7736f98584f2ece4707"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>set_index_end</b> (uint64_t end)</td></tr>
 <tr class="separator:a4111e941d518e7736f98584f2ece4707 inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a77f91bf80fd6fe31290c6f7ed3f45f0d inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a77f91bf80fd6fe31290c6f7ed3f45f0d"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>set_writer</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)</td></tr>
-<tr class="separator:a77f91bf80fd6fe31290c6f7ed3f45f0d inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7060ebeb3b41bd5c3c646b14a4d67743 inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7060ebeb3b41bd5c3c646b14a4d67743"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>set_writer</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)</td></tr>
+<tr class="separator:a7060ebeb3b41bd5c3c646b14a4d67743 inherit pro_methods_classshaka_1_1media_1_1webm_1_1SingleSegmentSegmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pro_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td colspan="2" onclick="javascript:toggleInherit('pro_methods_classshaka_1_1media_1_1webm_1_1Segmenter')"><img src="../../closed.png" alt="-"/>&#160;Protected Member Functions inherited from <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></td></tr>
 <tr class="memitem:a66c49dfab5316bea5b7b318871aef129 inherit pro_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memItemLeft" align="right" valign="top">uint64_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a66c49dfab5316bea5b7b318871aef129">FromBMFFTimescale</a> (uint64_t time_timescale)</td></tr>
 <tr class="separator:a66c49dfab5316bea5b7b318871aef129 inherit pro_methods_classshaka_1_1media_1_1webm_1_1Segmenter"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -209,7 +209,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec<
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>An implementation of a <a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a> for a single-segment that performs two passes. This does not use seeking and is used for non-seekable files. </p>
 
-<p>Definition at line <a class="el" href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html#l00027">27</a> of file <a class="el" href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html">two_pass_single_segment_segmenter.h</a>.</p>
+<p>Definition at line <a class="el" href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html#l00026">26</a> of file <a class="el" href="../../db/d51/two__pass__single__segment__segmenter_8h_source.html">two_pass_single_segment_segmenter.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="../../db/d51/two__pass__single__segment__segmenter_8h_source.html">two_pass_single_segment_segmenter.h</a></li>
 <li>media/formats/webm/<a class="el" href="../../d1/d1c/two__pass__single__segment__segmenter_8cc_source.html">two_pass_single_segment_segmenter.cc</a></li>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 2fe13d4645..a9ea4a53f9 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
@@ -100,11 +100,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#ifndef MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_</span></div>
 <div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_</span></div>
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></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;<span class="preprocessor">#include &lt;string&gt;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</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="preprocessor">#include &quot;packager/base/macros.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_options.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;</div>
@@ -150,23 +150,22 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;                                   <span class="keyword">const</span> std::string&amp; output_file_path);</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;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  std::string output_file_name_;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  scoped_ptr&lt;MediaInfo&gt; media_info_;</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="keywordtype">bool</span> is_encrypted_;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="comment">// Storage for values passed to OnEncryptionInfoReady().</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  FourCC protection_scheme_;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  std::string default_key_id_;</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  std::vector&lt;ProtectionSystemSpecificInfo&gt; key_system_info_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html">VodMediaInfoDumpMuxerListener</a>);</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="l00086"></a><span class="lineno">   86</span>&#160;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="preprocessor">#endif  // MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  std::string output_file_name_;</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  std::unique_ptr&lt;MediaInfo&gt; media_info_;</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> is_encrypted_;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// Storage for values passed to OnEncryptionInfoReady().</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  FourCC protection_scheme_;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  std::string default_key_id_;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  std::vector&lt;ProtectionSystemSpecificInfo&gt; key_system_info_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html">VodMediaInfoDumpMuxerListener</a>);</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="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="preprocessor">#endif  // MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_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_1VodMediaInfoDumpMuxerListener_html_a25fc470ed18733954876a4d4256aacf9"><div class="ttname"><a href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html#a25fc470ed18733954876a4d4256aacf9">shaka::media::VodMediaInfoDumpMuxerListener::OnSampleDurationReady</a></div><div class="ttdeci">void OnSampleDurationReady(uint32_t sample_duration) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d0/d49/vod__media__info__dump__muxer__listener_8cc_source.html#l00067">vod_media_info_dump_muxer_listener.cc:67</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener_html"><div class="ttname"><a href="../../db/dd0/classshaka_1_1media_1_1VodMediaInfoDumpMuxerListener.html">shaka::media::VodMediaInfoDumpMuxerListener</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/daa/vod__media__info__dump__muxer__listener_8h_source.html#l00028">vod_media_info_dump_muxer_listener.h:28</a></div></div>
@@ -181,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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b9f2a92bf7..e2bf312d25 100644
--- a/docs/dd/dab/webm__muxer_8h_source.html
+++ b/docs/dd/dab/webm__muxer_8h_source.html
@@ -119,7 +119,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">void</span> FireOnMediaStartEvent();</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">void</span> FireOnMediaEndEvent();</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;  scoped_ptr&lt;Segmenter&gt; segmenter_;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  std::unique_ptr&lt;Segmenter&gt; segmenter_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d3/d73/classshaka_1_1media_1_1webm_1_1WebMMuxer.html">WebMMuxer</a>);</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;};</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 56d4f8bfa1..78dbe0cb0b 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 2abad136ea..7f6096c9d1 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 63c3d97f54..7114b9fc95 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 27e53cd791..78b698e044 100644
--- a/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html
+++ b/docs/dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html
@@ -148,7 +148,7 @@ Protected Member Functions</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>This corresponds to RepresentationBaseType in MPD. RepresentationBaseType is not a concrete element type so this should not get instantiated on its own. <a class="el" href="../../d8/d8e/classshaka_1_1AdaptationSet.html">AdaptationSet</a> and <a class="el" href="../../de/d52/classshaka_1_1Representation.html">Representation</a> are subtypes of this. </p>
 
-<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00096">96</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00097">97</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
 </div><hr/>The documentation for this class was generated from the following files:<ul>
 <li>mpd/base/xml/<a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a></li>
 <li>mpd/base/xml/<a class="el" href="../../df/d96/xml__node_8cc_source.html">xml_node.cc</a></li>
@@ -156,7 +156,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 4a6b6992f6..b33420691f 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d29e80980f..8f414713d0 100644
--- a/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html
+++ b/docs/dd/dbd/structshaka_1_1media_1_1EncryptionKey.html
@@ -112,7 +112,7 @@ std::vector&lt; uint8_t &gt;&#160;</td><td class="memItemRight" valign="bottom">
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p>Definition at line <a class="el" href="../../dc/d3f/key__source_8h_source.html#l00020">20</a> of file <a class="el" href="../../dc/d3f/key__source_8h_source.html">key_source.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dc/d3f/key__source_8h_source.html#l00019">19</a> of file <a class="el" href="../../dc/d3f/key__source_8h_source.html">key_source.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following files:<ul>
 <li>media/base/<a class="el" href="../../dc/d3f/key__source_8h_source.html">key_source.h</a></li>
 <li>media/base/<a class="el" href="../../d7/dd6/key__source_8cc_source.html">key_source.cc</a></li>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8a23675349..2ad8d6ff82 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 77ba7254b1..83a6df1e3a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 9561e97e78..0e820afdcc 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 d9b67661a8..69a37413a7 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 7d2572a28d..ed6b6f5374 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
@@ -111,8 +111,8 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a40ef2af1da328cfdeefe37ef007146bb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a40ef2af1da328cfdeefe37ef007146bb"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>Segmenter</b> (const <a class="el" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a> &amp;options)</td></tr>
 <tr class="separator:a40ef2af1da328cfdeefe37ef007146bb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a144b19be7c3f693b06da2fbe2e40587a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
-<tr class="separator:a144b19be7c3f693b06da2fbe2e40587a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa6b32c805c4e662d97244531723ce9eb"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">Initialize</a> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer, <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a> *info, <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> *progress_listener, <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> *muxer_listener, <a class="el" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a> *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</td></tr>
+<tr class="separator:aa6b32c805c4e662d97244531723ce9eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa84782877f1afaf9519a552ac3d5d417"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">Finalize</a> ()</td></tr>
 <tr class="separator:aa84782877f1afaf9519a552ac3d5d417"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa15ccabe1a33c660201ef1d8386067e5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa15ccabe1a33c660201ef1d8386067e5">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
@@ -174,9 +174,9 @@ uint64_t&#160;</td><td class="memItemRight" valign="bottom"><b>segment_payload_p
 <tr class="memitem:a1b8546143b01ab165f9ea8107b93c685"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1b8546143b01ab165f9ea8107b93c685"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>cluster_length_sec</b> () const </td></tr>
 <tr class="separator:a1b8546143b01ab165f9ea8107b93c685"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aee0bf523c27a5eb674b28d9e3e8eb4f5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aee0bf523c27a5eb674b28d9e3e8eb4f5"></a>
-virtual <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)=0</td></tr>
-<tr class="separator:aee0bf523c27a5eb674b28d9e3e8eb4f5"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a94da091e038ad363eb7494624cffb2bd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a94da091e038ad363eb7494624cffb2bd"></a>
+virtual <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoInitialize</b> (std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt; writer)=0</td></tr>
+<tr class="separator:a94da091e038ad363eb7494624cffb2bd"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aecd2ba940ced9047d4f9595f023d870b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aecd2ba940ced9047d4f9595f023d870b"></a>
 virtual <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><b>DoFinalize</b> ()=0</td></tr>
 <tr class="separator:aecd2ba940ced9047d4f9595f023d870b"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -349,14 +349,14 @@ virtual <a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Sta
 
 </div>
 </div>
-<a class="anchor" id="a144b19be7c3f693b06da2fbe2e40587a"></a>
+<a class="anchor" id="aa6b32c805c4e662d97244531723ce9eb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> shaka::media::webm::Segmenter::Initialize </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">MkvWriter</a> &gt;&#160;</td>
           <td class="paramname"><em>writer</em>, </td>
         </tr>
         <tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 c6207ed4f8..43b6f8914f 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 5e21c993fb..03efd5edf4 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 14008635a1..c771db92de 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6922f1608e..9e7615ae37 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 e6b39eba98..c671cb4ae8 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 f621202300..1662b8b320 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 1c4c4ba3d1..68ff6a0d34 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 477bc6a0be..50561a7d5b 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 a8e44a6f59..3fbf765108 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f4fbe20cbb..5ce70f0ddb 100644
--- a/docs/dd/de7/xml__node_8h_source.html
+++ b/docs/dd/de7/xml__node_8h_source.html
@@ -104,114 +104,115 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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 &lt;list&gt;</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="preprocessor">#include &quot;packager/mpd/base/content_protection_element.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/xml/scoped_xml_ptr.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;</div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="keyword">struct </span>SegmentInfo;</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>xml {</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</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="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name);</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a>();</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(scoped_xml_ptr&lt;xmlNode&gt; child);</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">AddElements</a>(<span class="keyword">const</span> std::vector&lt;Element&gt;&amp; elements);</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;                          <span class="keyword">const</span> std::string&amp; attribute);</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, uint64_t number);</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="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">SetFloatingPointAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, <span class="keywordtype">double</span> number);</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">SetId</a>(uint32_t <span class="keywordtype">id</span>);</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</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="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">SetContent</a>(<span class="keyword">const</span> std::string&amp; content);</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>();</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">Release</a>();</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">GetRawPtr</a>();</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">private</span>:</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  scoped_xml_ptr&lt;xmlNode&gt; node_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a>);</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="l00096"></a><span class="lineno"><a class="line" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">   96</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> {</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  ~<a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="keywordtype">bool</span> AddContentProtectionElements(</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;      <span class="keyword">const</span> std::list&lt;ContentProtectionElement&gt;&amp; content_protection_elements);</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="keyword">protected</span>:</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="keywordtype">bool</span> AddContentProtectionElement(</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</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="l00108"></a><span class="lineno">  108</span>&#160;</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>);</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="l00113"></a><span class="lineno"><a class="line" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">  113</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> {</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;  <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>();</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  ~<a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">AddRoleElement</a>(<span class="keyword">const</span> std::string&amp; scheme_id_uri,</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;                      <span class="keyword">const</span> std::string&amp; value);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>);</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="l00128"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">  128</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> {</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>();</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  ~<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">AddVideoInfo</a>(<span class="keyword">const</span> MediaInfo::VideoInfo&amp; video_info,</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;                    <span class="keywordtype">bool</span> set_width,</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;                    <span class="keywordtype">bool</span> set_height,</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;                    <span class="keywordtype">bool</span> set_frame_rate);</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">AddAudioInfo</a>(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">AddVODOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info);</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">AddLiveOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;                       <span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;                       uint32_t start_number);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="comment">// Add AudioChannelConfiguration element. Note that it is a required element</span></div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="comment">// for audio Representations.</span></div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="keywordtype">bool</span> AddAudioChannelInfo(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</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="comment">// Add audioSamplingRate attribute to this element, if present.</span></div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;  <span class="keywordtype">void</span> AddAudioSamplingRateInfo(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>);</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">// namespace xml</span></div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;}  <span class="comment">// namespace shaka</span></div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;<span class="preprocessor">#endif  // MPD_BASE_XML_XML_NODE_H_</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/base/macros.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/content_protection_element.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/media_info.pb.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;packager/mpd/base/xml/scoped_xml_ptr.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;</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">struct </span>SegmentInfo;</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>xml {</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
+<div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">   32</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</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="l00036"></a><span class="lineno">   36</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a52ffb838d25293eafbea9f05fb1c2d17">XmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name);</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a>();</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a5f8deed2a9bb707c40db24374b3b7fbd">AddChild</a>(scoped_xml_ptr&lt;xmlNode&gt; child);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a31d77d822a66991f48b67bfad3fa86d0">AddElements</a>(<span class="keyword">const</span> std::vector&lt;Element&gt;&amp; elements);</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329">SetStringAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name,</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;                          <span class="keyword">const</span> std::string&amp; attribute);</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20">SetIntegerAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, uint64_t number);</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="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba">SetFloatingPointAttribute</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* attribute_name, <span class="keywordtype">double</span> number);</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f">SetId</a>(uint32_t <span class="keywordtype">id</span>);</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">SetContent</a>(<span class="keyword">const</span> std::string&amp; content);</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;  scoped_xml_ptr&lt;xmlNode&gt; <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a0be0a3e9b041978e118d994c1f13e8fb">PassScopedPtr</a>();</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;  xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0">Release</a>();</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  xmlNodePtr <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html#aac9765712087dcc47a0afef4bf7849ff">GetRawPtr</a>();</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">private</span>:</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;  scoped_xml_ptr&lt;xmlNode&gt; node_;</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="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</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="l00097"></a><span class="lineno"><a class="line" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">   97</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../d1/d31/classshaka_1_1xml_1_1XmlNode.html">XmlNode</a> {</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  ~<a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordtype">bool</span> AddContentProtectionElements(</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;      <span class="keyword">const</span> std::list&lt;ContentProtectionElement&gt;&amp; content_protection_elements);</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="keyword">protected</span>:</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* name);</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="keyword">private</span>:</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordtype">bool</span> AddContentProtectionElement(</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</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="l00109"></a><span class="lineno">  109</span>&#160;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a>);</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="l00114"></a><span class="lineno"><a class="line" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">  114</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> {</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;  <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>();</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  ~<a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1">AddRoleElement</a>(<span class="keyword">const</span> std::string&amp; scheme_id_uri,</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;                      <span class="keyword">const</span> std::string&amp; value);</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html">AdaptationSetXmlNode</a>);</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="l00129"></a><span class="lineno"><a class="line" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">  129</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a> : <span class="keyword">public</span> <a class="code" href="../../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html">RepresentationBaseXmlNode</a> {</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>();</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;  ~<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#aeb5b425a0d9fe472e13e508ee431307a">AddVideoInfo</a>(<span class="keyword">const</span> MediaInfo::VideoInfo&amp; video_info,</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;                    <span class="keywordtype">bool</span> set_width,</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;                    <span class="keywordtype">bool</span> set_height,</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;                    <span class="keywordtype">bool</span> set_frame_rate);</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a49050cf0e7883bfa6e8e2fb0174b2a7a">AddAudioInfo</a>(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#a68a51ea870f2a24379a9b81cb97b6ac0">AddVODOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info);</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60">AddLiveOnlyInfo</a>(<span class="keyword">const</span> MediaInfo&amp; media_info,</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;                       <span class="keyword">const</span> std::list&lt;SegmentInfo&gt;&amp; segment_infos,</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;                       uint32_t start_number);</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="keyword">private</span>:</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="comment">// Add AudioChannelConfiguration element. Note that it is a required element</span></div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;  <span class="comment">// for audio Representations.</span></div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;  <span class="keywordtype">bool</span> AddAudioChannelInfo(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</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="comment">// Add audioSamplingRate attribute to this element, if present.</span></div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;  <span class="keywordtype">void</span> AddAudioSamplingRateInfo(<span class="keyword">const</span> MediaInfo::AudioInfo&amp; audio_info);</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html">RepresentationXmlNode</a>);</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 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"><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#l00128">xml_node.h:128</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#l00096">xml_node.h:96</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_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#l00113">xml_node.h:113</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#l00031">xml_node.h:31</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>
@@ -230,7 +231,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 8b78bfee9d..1801546355 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 53219f89f1..18cf308fcb 100644
--- a/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html
+++ b/docs/dd/df2/webm_2multi__segment__segmenter_8h_source.html
@@ -96,60 +96,59 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_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 &quot;packager/media/formats/webm/segmenter.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="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/status.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/mkv_writer.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">struct </span>MuxerOptions;</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">namespace </span>webm {</div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno"><a class="line" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">   25</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a> {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options);</div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  ~<a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>() <span class="keyword">override</span>;</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">   32</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#ae88bf7cfee4a1ad12c6060310b8f464e">GetInitRangeStartAndEnd</a>(uint64_t* start, uint64_t* end) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#a75b572a055a0de68bf2809f61b319526">GetIndexRangeStartAndEnd</a>(uint64_t* start, uint64_t* end) <span class="keyword">override</span>;</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="keyword">protected</span>:</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</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="keyword">private</span>:</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSubsegment(uint64_t start_timescale) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSegment(uint64_t start_timescale) <span class="keyword">override</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;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> FinalizeSegment();</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;  scoped_ptr&lt;MkvWriter&gt; writer_;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;  uint32_t num_segment_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>);</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">// namespace webm</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;}  <span class="comment">// namespace shaka</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;<span class="preprocessor">#endif  // MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/status.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/webm/mkv_writer.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/segmenter.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">struct </span>MuxerOptions;</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>webm {</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;</div>
+<div class="line"><a name="l00024"></a><span class="lineno"><a class="line" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">   24</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a> : <span class="keyword">public</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a> {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160; <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options);</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  ~<a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>() <span class="keyword">override</span>;</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">   31</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#ae88bf7cfee4a1ad12c6060310b8f464e">GetInitRangeStartAndEnd</a>(uint64_t* start, uint64_t* end) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#a75b572a055a0de68bf2809f61b319526">GetIndexRangeStartAndEnd</a>(uint64_t* start, uint64_t* end) <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">protected</span>:</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() <span class="keyword">override</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="keyword">private</span>:</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="comment">// Segmenter implementation overrides.</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSubsegment(uint64_t start_timescale) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> NewSegment(uint64_t start_timescale) <span class="keyword">override</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;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> FinalizeSegment();</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;  std::unique_ptr&lt;MkvWriter&gt; writer_;</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  uint32_t num_segment_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">MultiSegmentSegmenter</a>);</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="comment">// namespace webm</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;}  <span class="comment">// namespace shaka</span></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="preprocessor">#endif  // MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter_html_a75b572a055a0de68bf2809f61b319526"><div class="ttname"><a href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#a75b572a055a0de68bf2809f61b319526">shaka::media::webm::MultiSegmentSegmenter::GetIndexRangeStartAndEnd</a></div><div class="ttdeci">bool GetIndexRangeStartAndEnd(uint64_t *start, uint64_t *end) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d4e/webm_2multi__segment__segmenter_8cc_source.html#l00029">multi_segment_segmenter.cc:29</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter_html_ae88bf7cfee4a1ad12c6060310b8f464e"><div class="ttname"><a href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html#ae88bf7cfee4a1ad12c6060310b8f464e">shaka::media::webm::MultiSegmentSegmenter::GetInitRangeStartAndEnd</a></div><div class="ttdeci">bool GetInitRangeStartAndEnd(uint64_t *start, uint64_t *end) override</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/d4e/webm_2multi__segment__segmenter_8cc_source.html#l00024">multi_segment_segmenter.cc:24</a></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_1webm_1_1Segmenter_html"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../df/ddc/webm_2segmenter_8h_source.html#l00034">segmenter.h:34</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_1webm_1_1MultiSegmentSegmenter_html"><div class="ttname"><a href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html#l00025">multi_segment_segmenter.h:25</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter_html"><div class="ttname"><a href="../../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html">shaka::media::webm::MultiSegmentSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../dd/df2/webm_2multi__segment__segmenter_8h_source.html#l00024">multi_segment_segmenter.h:24</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 9665268aac..bbe1865318 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 8219667777..93100c3f83 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 2d448f8af4..23a2369344 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 27de4d84e1..69713b4976 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 796600af53..962c9837ac 100644
--- a/docs/de/d13/ts__writer_8cc_source.html
+++ b/docs/de/d13/ts__writer_8cc_source.html
@@ -324,7 +324,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;  <span class="keywordflow">return</span> current_file_.release()-&gt;Close();</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"><a class="line" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">  238</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">TsWriter::AddPesPacket</a>(scoped_ptr&lt;PesPacket&gt; pes_packet) {</div>
+<div class="line"><a name="l00238"></a><span class="lineno"><a class="line" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">  238</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">TsWriter::AddPesPacket</a>(std::unique_ptr&lt;PesPacket&gt; pes_packet) {</div>
 <div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;  DCHECK(current_file_);</div>
 <div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  <span class="keywordflow">if</span> (!WritePesToFile(*pes_packet, &amp;elementary_stream_continuity_counter_,</div>
 <div class="line"><a name="l00241"></a><span class="lineno">  241</span>&#160;                      current_file_.get())) {</div>
@@ -336,9 +336,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">  250</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">TsWriter::SetProgramMapTableWriterForTesting</a>(</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    scoped_ptr&lt;ProgramMapTableWriter&gt; table_writer) {</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  pmt_writer_ = table_writer.Pass();</div>
+<div class="line"><a name="l00250"></a><span class="lineno"><a class="line" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">  250</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">TsWriter::SetProgramMapTableWriterForTesting</a>(</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;    std::unique_ptr&lt;ProgramMapTableWriter&gt; table_writer) {</div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;  pmt_writer_ = std::move(table_writer);</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="comment">// namespace mp2t</span></div>
@@ -348,10 +348,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_1AacProgramMapTableWriter_html"><div class="ttname"><a href="../../d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html">shaka::media::mp2t::AacProgramMapTableWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dcd/program__map__table__writer_8h_source.html#l00069">program_map_table_writer.h:69</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a9ba30b9cc1e4ae2992735709ae987c64"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a9ba30b9cc1e4ae2992735709ae987c64">shaka::media::mp2t::TsWriter::NewSegment</a></div><div class="ttdeci">virtual bool NewSegment(const std::string &amp;file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00199">ts_writer.cc:199</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a0bead9b328bf6c7c9d5bc6997fea2971"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">shaka::media::mp2t::TsWriter::SetProgramMapTableWriterForTesting</a></div><div class="ttdeci">void SetProgramMapTableWriterForTesting(scoped_ptr&lt; ProgramMapTableWriter &gt; table_writer)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00250">ts_writer.cc:250</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a19a7699df7ac129aedfdff074a8a18a3"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">shaka::media::mp2t::TsWriter::AddPesPacket</a></div><div class="ttdeci">virtual bool AddPesPacket(std::unique_ptr&lt; PesPacket &gt; pes_packet)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00238">ts_writer.cc:238</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_1mp2t_1_1H264ProgramMapTableWriter_html"><div class="ttname"><a href="../../de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html">shaka::media::mp2t::H264ProgramMapTableWriter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dcd/program__map__table__writer_8h_source.html#l00048">program_map_table_writer.h:48</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a8b2b5caa68f34a332a377524a5f23e61"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">shaka::media::mp2t::TsWriter::AddPesPacket</a></div><div class="ttdeci">virtual bool AddPesPacket(scoped_ptr&lt; PesPacket &gt; pes_packet)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00238">ts_writer.cc:238</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a6eeeadf8e60dc09378b5df7c62eb2bf0"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">shaka::media::mp2t::TsWriter::SetProgramMapTableWriterForTesting</a></div><div class="ttdeci">void SetProgramMapTableWriterForTesting(std::unique_ptr&lt; ProgramMapTableWriter &gt; table_writer)</div><div class="ttdoc">Only for testing. </div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00250">ts_writer.cc:250</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_ae9979f940d7a07127709576aa1f766a1"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#ae9979f940d7a07127709576aa1f766a1">shaka::media::mp2t::TsWriter::FinalizeSegment</a></div><div class="ttdeci">virtual bool FinalizeSegment()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00234">ts_writer.cc:234</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp2t_1_1TsWriter_html_a6bee605be771538f78633e2ecfc979c6"><div class="ttname"><a href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6">shaka::media::mp2t::TsWriter::Initialize</a></div><div class="ttdeci">virtual bool Initialize(const StreamInfo &amp;stream_info)</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d13/ts__writer_8cc_source.html#l00165">ts_writer.cc:165</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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 20dabed24f..ba37123241 100644
--- a/docs/de/d15/media__stream_8cc_source.html
+++ b/docs/de/d15/media__stream_8cc_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 6ddadb26f5..945b86aee5 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 393a96a512..8bc5cc17c9 100644
--- a/docs/de/d17/cluster__builder_8cc_source.html
+++ b/docs/de/d17/cluster__builder_8cc_source.html
@@ -148,8 +148,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  kInitialBufferSize = 32768,</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;Cluster::Cluster(scoped_ptr&lt;uint8_t[]&gt; data, <span class="keywordtype">int</span> size)</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    : data_(data.Pass()), size_(size) {}</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;Cluster::Cluster(std::unique_ptr&lt;uint8_t[]&gt; data, <span class="keywordtype">int</span> size)</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    : data_(std::move(data)), size_(size) {}</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;Cluster::~Cluster() {}</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;ClusterBuilder::ClusterBuilder() { Reset(); }</div>
@@ -289,24 +289,24 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  memcpy(buf + 4, data, size);</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;scoped_ptr&lt;Cluster&gt; ClusterBuilder::Finish() {</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;std::unique_ptr&lt;Cluster&gt; ClusterBuilder::Finish() {</div>
 <div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;  DCHECK_NE(cluster_timecode_, -1);</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;  UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));</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;  scoped_ptr&lt;Cluster&gt; ret(<span class="keyword">new</span> Cluster(buffer_.Pass(), bytes_used_));</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;  std::unique_ptr&lt;Cluster&gt; ret(<span class="keyword">new</span> Cluster(std::move(buffer_), bytes_used_));</div>
 <div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;  Reset();</div>
-<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  <span class="keywordflow">return</span> ret.Pass();</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;  <span class="keywordflow">return</span> ret;</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;scoped_ptr&lt;Cluster&gt; ClusterBuilder::FinishWithUnknownSize() {</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;std::unique_ptr&lt;Cluster&gt; ClusterBuilder::FinishWithUnknownSize() {</div>
 <div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;  DCHECK_NE(cluster_timecode_, -1);</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;  UpdateUInt64(kClusterSizeOffset, kWebMUnknownSize);</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;  scoped_ptr&lt;Cluster&gt; ret(<span class="keyword">new</span> Cluster(buffer_.Pass(), bytes_used_));</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;  std::unique_ptr&lt;Cluster&gt; ret(<span class="keyword">new</span> Cluster(std::move(buffer_), bytes_used_));</div>
 <div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;  Reset();</div>
-<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordflow">return</span> ret.Pass();</div>
+<div class="line"><a name="l00220"></a><span class="lineno">  220</span>&#160;  <span class="keywordflow">return</span> ret;</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;<span class="keywordtype">void</span> ClusterBuilder::Reset() {</div>
@@ -323,7 +323,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;  <span class="keywordflow">while</span> ((new_buffer_size - bytes_used_) &lt; bytes_needed)</div>
 <div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    new_buffer_size *= 2;</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;  scoped_ptr&lt;uint8_t[]&gt; new_buffer(<span class="keyword">new</span> uint8_t[new_buffer_size]);</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; new_buffer(<span class="keyword">new</span> uint8_t[new_buffer_size]);</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;  memcpy(new_buffer.get(), buffer_.get(), bytes_used_);</div>
 <div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160;  buffer_.reset(new_buffer.release());</div>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 e9557e13c6..bb01bbb345 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 c63d461e61..86a6f9ea67 100644
--- a/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html
+++ b/docs/de/d1e/mp4_2single__segment__segmenter_8cc_source.html
@@ -129,9 +129,9 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;SingleSegmentSegmenter::SingleSegmentSegmenter(<span class="keyword">const</span> MuxerOptions&amp; options,</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                                               scoped_ptr&lt;FileType&gt; ftyp,</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                                               scoped_ptr&lt;Movie&gt; moov)</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    : Segmenter(options, ftyp.Pass(), moov.Pass()) {}</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;                                               std::unique_ptr&lt;FileType&gt; ftyp,</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;                                               std::unique_ptr&lt;Movie&gt; moov)</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    : Segmenter(options, std::move(ftyp), std::move(moov)) {}</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;SingleSegmentSegmenter::~SingleSegmentSegmenter() {</div>
 <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;  <span class="keywordflow">if</span> (temp_file_)</div>
@@ -197,7 +197,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                  <span class="stringliteral">&quot;Cannot close the temp file &quot;</span> + temp_file_name_);</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;  scoped_ptr&lt;File, FileCloser&gt; file(</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; file(</div>
 <div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;      <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(options().output_file_name.c_str(), <span class="stringliteral">&quot;w&quot;</span>));</div>
 <div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;  <span class="keywordflow">if</span> (file == NULL) {</div>
 <div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    <span class="keywordflow">return</span> Status(error::FILE_FAILURE,</div>
@@ -208,7 +208,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;            &lt;&lt; options().<a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html#a5397ee8759a663aea68261600e528d82">output_file_name</a> &lt;&lt; <span class="stringliteral">&quot;&#39;.&quot;</span>;</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">// Write ftyp, moov and sidx to output file.</span></div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  scoped_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> BufferWriter());</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  std::unique_ptr&lt;BufferWriter&gt; buffer(<span class="keyword">new</span> BufferWriter());</div>
 <div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  ftyp()-&gt;Write(buffer.get());</div>
 <div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  moov()-&gt;Write(buffer.get());</div>
 <div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  vod_sidx_-&gt;Write(buffer.get());</div>
@@ -217,7 +217,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;    <span class="keywordflow">return</span> status;</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">// Load the temp file and write to output file.</span></div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  scoped_ptr&lt;File, FileCloser&gt; temp_file(</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  std::unique_ptr&lt;File, FileCloser&gt; temp_file(</div>
 <div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;      <a class="code" href="../../d3/d61/classshaka_1_1media_1_1File.html#aad6b77e734bb22d077ece029c9e735a4">File::Open</a>(temp_file_name_.c_str(), <span class="stringliteral">&quot;r&quot;</span>));</div>
 <div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  <span class="keywordflow">if</span> (temp_file == NULL) {</div>
 <div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;    <span class="keywordflow">return</span> Status(error::FILE_FAILURE,</div>
@@ -228,7 +228,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  <span class="keyword">const</span> uint64_t re_segment_progress_target = progress_target() * 0.5;</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="keyword">const</span> <span class="keywordtype">int</span> kBufSize = 0x200000;  <span class="comment">// 2MB.</span></div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  scoped_ptr&lt;uint8_t[]&gt; buf(<span class="keyword">new</span> uint8_t[kBufSize]);</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  std::unique_ptr&lt;uint8_t[]&gt; buf(<span class="keyword">new</span> uint8_t[kBufSize]);</div>
 <div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keywordflow">while</span> (<span class="keyword">true</span>) {</div>
 <div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;    int64_t size = temp_file-&gt;Read(buf.get(), kBufSize);</div>
 <div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;    <span class="keywordflow">if</span> (size == 0) {</div>
@@ -332,11 +332,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_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_1webm_1_1Segmenter_html_a32dc8b7461252b99fe52384b04e3bca2"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a32dc8b7461252b99fe52384b04e3bca2">shaka::media::webm::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="../../dc/d53/webm_2segmenter_8cc_source.html#l00255">segmenter.cc:255</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00167">file.cc:167</a></div></div>
+<div class="ttc" id="classshaka_1_1media_1_1File_html_a92cdfd68e6384dfcc14c78b20c98368e"><div class="ttname"><a href="../../d3/d61/classshaka_1_1media_1_1File.html#a92cdfd68e6384dfcc14c78b20c98368e">shaka::media::File::Delete</a></div><div class="ttdeci">static bool Delete(const char *file_name)</div><div class="ttdef"><b>Definition:</b> <a href="../../d5/dfc/file_8cc_source.html#l00164">file.cc:164</a></div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 7cc855a4f1..2f1ae2811d 100644
--- a/docs/de/d22/aes__pattern__cryptor_8cc_source.html
+++ b/docs/de/d22/aes__pattern__cryptor_8cc_source.html
@@ -102,16 +102,16 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">   16</a></span>&#160;<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">AesPatternCryptor::AesPatternCryptor</a>(uint8_t crypt_byte_block,</div>
+<div class="line"><a name="l00016"></a><span class="lineno"><a class="line" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">   16</a></span>&#160;<a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">AesPatternCryptor::AesPatternCryptor</a>(uint8_t crypt_byte_block,</div>
 <div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;                                     uint8_t skip_byte_block,</div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;                                     <a class="code" href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#a54fd35d7782d3b4948c7eb68387711f0">PatternEncryptionMode</a> encryption_mode,</div>
 <div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;                                     ConstantIvFlag constant_iv_flag,</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                                     scoped_ptr&lt;AesCryptor&gt; cryptor)</div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;                                     std::unique_ptr&lt;AesCryptor&gt; cryptor)</div>
 <div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;    : <a class="code" href="../../df/d87/classshaka_1_1media_1_1AesCryptor.html">AesCryptor</a>(constant_iv_flag),</div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;      crypt_byte_block_(crypt_byte_block),</div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;      skip_byte_block_(skip_byte_block),</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;      encryption_mode_(encryption_mode),</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      cryptor_(cryptor.Pass()) {</div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;      cryptor_(std::move(cryptor)) {</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;  <span class="comment">// |crypt_byte_block_| should never be 0. |skip_byte_block_| can be 0 to allow</span></div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;  <span class="comment">// a special pattern of 1:0, which is the pattern for the case of pattern</span></div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;  <span class="comment">// encryption when applied to non video tracks.</span></div>
@@ -190,15 +190,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;}  <span class="comment">// namespace shaka</span></div>
 <div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_af878688f0f277f3f6757e85654439c34"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">shaka::media::AesPatternCryptor::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="../../de/d22/aes__pattern__cryptor_8cc_source.html#l00037">aes_pattern_cryptor.cc:37</a></div></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_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#l00034">aes_pattern_cryptor.h:34</a></div></div>
-<div class="ttc" id="classshaka_1_1media_1_1AesPatternCryptor_html_ad76aebd0a9f7cc78f6f841cbce359107"><div class="ttname"><a href="../../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">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, scoped_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 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#l00020">aes_pattern_cryptor.h:20</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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 7f3749b93e..72ca9236b8 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 5fc3dcd23b..ae41960754 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9b8987ec0f..94d59912a3 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 62df3fa410..e68bc1b0ec 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3ce9092481..0549342992 100644
--- a/docs/de/d34/offset__byte__queue_8h_source.html
+++ b/docs/de/d34/offset__byte__queue_8h_source.html
@@ -139,11 +139,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html_ab1aa8f95daa784e4dc1ce34566cea164"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html#ab1aa8f95daa784e4dc1ce34566cea164">shaka::media::OffsetByteQueue::tail</a></div><div class="ttdeci">int64_t tail()</div><div class="ttdef"><b>Definition:</b> <a href="../../de/d34/offset__byte__queue_8h_source.html#l00055">offset_byte_queue.h:55</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html_a77b9a12145dad80df95845bd2b66b6a8"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html#a77b9a12145dad80df95845bd2b66b6a8">shaka::media::OffsetByteQueue::Trim</a></div><div class="ttdeci">bool Trim(int64_t max_offset)</div><div class="ttdef"><b>Definition:</b> <a href="../../df/d1a/offset__byte__queue_8cc_source.html#l00051">offset_byte_queue.cc:51</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html">shaka::media::OffsetByteQueue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/d34/offset__byte__queue_8h_source.html#l00019">offset_byte_queue.h:19</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#l00020">byte_queue.h:20</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 54d1356728..6e5b607ef7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 19e300a7a1..e799b5060e 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 9d2f03b724..254bb42889 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 ec44ef1a14..1464772c90 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 967880cffb..e24353977f 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 c7c7244a91..32d96bd256 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 5eb79f150f..e9dbe70da7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6f13b4b0d6..9d278b693f 100644
--- a/docs/de/d52/classshaka_1_1Representation.html
+++ b/docs/de/d52/classshaka_1_1Representation.html
@@ -139,15 +139,15 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
 <tr class="separator:a473e45dbbf64e6ab6ed670ccedac84ed"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a6a3ba385179698e57a1451d1a26ad827"><td class="memItemLeft" align="right" valign="top">uint32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827">id</a> () const </td></tr>
 <tr class="separator:a6a3ba385179698e57a1451d1a26ad827"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad029323166bb60175a2369c3e887dca0"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">Representation</a> (const MediaInfo &amp;media_info, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, uint32_t representation_id, scoped_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt; state_change_listener)</td></tr>
-<tr class="separator:ad029323166bb60175a2369c3e887dca0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a997138fcaa5deef5151a64a2d7ce6aeb"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">Representation</a> (const MediaInfo &amp;media_info, const <a class="el" href="../../d1/df3/structshaka_1_1MpdOptions.html">MpdOptions</a> &amp;mpd_options, uint32_t representation_id, std::unique_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt; state_change_listener)</td></tr>
+<tr class="separator:a997138fcaa5deef5151a64a2d7ce6aeb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <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>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="ad029323166bb60175a2369c3e887dca0"></a>
+<a class="anchor" id="a997138fcaa5deef5151a64a2d7ce6aeb"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -175,7 +175,7 @@ template&lt;MpdBuilder::MpdType type&gt; </td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../df/d94/classshaka_1_1RepresentationStateChangeListener.html">RepresentationStateChangeListener</a> &gt;&#160;</td>
           <td class="paramname"><em>state_change_listener</em>&#160;</td>
         </tr>
         <tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 86896e1351..6f4b96e006 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 625ec26aa5..7151c18ac7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 6fbf92e9ce..956a9fbd9e 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 Fri Aug 19 2016 00:08:19 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 47c7585509..e88b0131da 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 94b39f1017..f846877f68 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
@@ -108,19 +108,19 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr class="separator:afc47f61bce7cd4f8f6a6ea0ec2c96d4c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae9979f940d7a07127709576aa1f766a1"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#ae9979f940d7a07127709576aa1f766a1">FinalizeSegment</a> ()</td></tr>
 <tr class="separator:ae9979f940d7a07127709576aa1f766a1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8b2b5caa68f34a332a377524a5f23e61"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">AddPesPacket</a> (scoped_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt; pes_packet)</td></tr>
-<tr class="separator:a8b2b5caa68f34a332a377524a5f23e61"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0bead9b328bf6c7c9d5bc6997fea2971"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0bead9b328bf6c7c9d5bc6997fea2971"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">SetProgramMapTableWriterForTesting</a> (scoped_ptr&lt; <a class="el" href="../../dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html">ProgramMapTableWriter</a> &gt; table_writer)</td></tr>
-<tr class="memdesc:a0bead9b328bf6c7c9d5bc6997fea2971"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
-<tr class="separator:a0bead9b328bf6c7c9d5bc6997fea2971"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a19a7699df7ac129aedfdff074a8a18a3"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">AddPesPacket</a> (std::unique_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt; pes_packet)</td></tr>
+<tr class="separator:a19a7699df7ac129aedfdff074a8a18a3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a6eeeadf8e60dc09378b5df7c62eb2bf0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6eeeadf8e60dc09378b5df7c62eb2bf0"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">SetProgramMapTableWriterForTesting</a> (std::unique_ptr&lt; <a class="el" href="../../dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html">ProgramMapTableWriter</a> &gt; table_writer)</td></tr>
+<tr class="memdesc:a6eeeadf8e60dc09378b5df7c62eb2bf0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
+<tr class="separator:a6eeeadf8e60dc09378b5df7c62eb2bf0"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>This class takes PesPackets, encapsulates them into TS packets, and write the data to file. This also creates PSI from <a class="el" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html" title="Abstract class holds stream information. ">StreamInfo</a>. </p>
 
 <p>Definition at line <a class="el" href="../../d8/dca/ts__writer_8h_source.html#l00028">28</a> of file <a class="el" href="../../d8/dca/ts__writer_8h_source.html">ts_writer.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
-<a class="anchor" id="a8b2b5caa68f34a332a377524a5f23e61"></a>
+<a class="anchor" id="a19a7699df7ac129aedfdff074a8a18a3"></a>
 <div class="memitem">
 <div class="memproto">
 <table class="mlabels">
@@ -130,7 +130,7 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
         <tr>
           <td class="memname">bool shaka::media::mp2t::TsWriter::AddPesPacket </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html">PesPacket</a> &gt;&#160;</td>
           <td class="paramname"><em>pes_packet</em></td><td>)</td>
           <td></td>
         </tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 851bc4b0a0..2abfb66c9e 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9706bd439d..237d486e46 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f48fc0dde1..7a8697d8be 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 e0602586cf..cf06ff2c01 100644
--- a/docs/de/d77/webm__content__encodings__client_8cc_source.html
+++ b/docs/de/d77/webm__content__encodings__client_8cc_source.html
@@ -354,14 +354,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00016">webm_content_encodings.h:16</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#l00021">webm_content_encodings.h:21</a></div></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_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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 10a294a89e..123d26b242 100644
--- a/docs/de/d7b/mp4__media__parser_8h_source.html
+++ b/docs/de/d7b/mp4__media__parser_8h_source.html
@@ -99,114 +99,112 @@ 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;stdint.h&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;map&gt;</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;vector&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/base/callback_forward.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.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/decryptor_source.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/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/base/offset_byte_queue.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>mp4 {</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>BoxReader;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">class </span>TrackRunIterator;</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="keyword">struct </span>Movie;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="keyword">struct </span>ProtectionSystemSpecificHeader;</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"><a class="line" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">   33</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</a> {</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160; <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>();</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;  ~<a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>() <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#acc87b9752a7f6e8c739109acbc02b69d">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;            <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;            <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) <span class="keyword">override</span>;</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a6f26e0d76aeda601fa87190901de27ea">Flush</a>() <span class="keyword">override</span> WARN_UNUSED_RESULT;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a4105cdbe5ece03071a17c06fb27699b0">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="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">LoadMoov</a>(<span class="keyword">const</span> std::string&amp; file_path);</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="keyword">private</span>:</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;  <span class="keyword">enum</span> State {</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    kWaitingForInit,</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    kParsingBoxes,</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    kEmittingSamples,</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    kError</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> ParseBox(<span class="keywordtype">bool</span>* err);</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">bool</span> ParseMoov(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">mp4::BoxReader</a>* reader);</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;  <span class="keywordtype">bool</span> ParseMoof(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">mp4::BoxReader</a>* reader);</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="keywordtype">bool</span> FetchKeysIfNecessary(</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;      <span class="keyword">const</span> std::vector&lt;ProtectionSystemSpecificHeader&gt;&amp; headers);</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">// To retain proper framing, each &#39;mdat&#39; box must be read; to limit memory</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="comment">// usage, the box&#39;s data needs to be discarded incrementally as frames are</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="comment">// extracted from the stream. This function discards data from the stream up</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// to |offset|, updating the |mdat_tail_| value so that framing can be</span></div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// retained after all &#39;mdat&#39; information has been read.</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// Returns &#39;true&#39; on success, &#39;false&#39; if there was an error.</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordtype">bool</span> ReadAndDiscardMDATsUntil(<span class="keyword">const</span> int64_t offset);</div>
+<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;memory&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/callback_forward.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/decryptor_source.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/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/base/offset_byte_queue.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>mp4 {</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">class </span>BoxReader;</div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">class </span>TrackRunIterator;</div>
+<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="keyword">struct </span>Movie;</div>
+<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">struct </span>ProtectionSystemSpecificHeader;</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="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">   31</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a> : <span class="keyword">public</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html">MediaParser</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="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>();</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  ~<a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>() <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#acc87b9752a7f6e8c739109acbc02b69d">Init</a>(<span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a>&amp; init_cb,</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;            <span class="keyword">const</span> <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a>&amp; new_sample_cb,</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;            <a class="code" href="../../d1/d1f/classshaka_1_1media_1_1KeySource.html">KeySource</a>* decryption_key_source) <span class="keyword">override</span>;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a6f26e0d76aeda601fa87190901de27ea">Flush</a>() <span class="keyword">override</span> WARN_UNUSED_RESULT;</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a4105cdbe5ece03071a17c06fb27699b0">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="l00044"></a><span class="lineno">   44</span>&#160;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="keywordtype">bool</span> <a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">LoadMoov</a>(<span class="keyword">const</span> std::string&amp; file_path);</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">private</span>:</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">enum</span> State {</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    kWaitingForInit,</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    kParsingBoxes,</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    kEmittingSamples,</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    kError</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="keywordtype">bool</span> ParseBox(<span class="keywordtype">bool</span>* err);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;  <span class="keywordtype">bool</span> ParseMoov(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">mp4::BoxReader</a>* reader);</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;  <span class="keywordtype">bool</span> ParseMoof(<a class="code" href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">mp4::BoxReader</a>* reader);</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="keywordtype">bool</span> FetchKeysIfNecessary(</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;      <span class="keyword">const</span> std::vector&lt;ProtectionSystemSpecificHeader&gt;&amp; headers);</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">// To retain proper framing, each &#39;mdat&#39; box must be read; to limit memory</span></div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;  <span class="comment">// usage, the box&#39;s data needs to be discarded incrementally as frames are</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;  <span class="comment">// extracted from the stream. This function discards data from the stream up</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  <span class="comment">// to |offset|, updating the |mdat_tail_| value so that framing can be</span></div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  <span class="comment">// retained after all &#39;mdat&#39; information has been read.</span></div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;  <span class="comment">// Returns &#39;true&#39; on success, &#39;false&#39; if there was an error.</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="keywordtype">bool</span> ReadAndDiscardMDATsUntil(<span class="keyword">const</span> int64_t offset);</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">void</span> ChangeState(State new_state);</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">void</span> ChangeState(State new_state);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;  <span class="keywordtype">bool</span> EmitConfigs();</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> EmitConfigs();</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;  <span class="keywordtype">bool</span> EnqueueSample(<span class="keywordtype">bool</span>* err);</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> EnqueueSample(<span class="keywordtype">bool</span>* err);</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  <span class="keywordtype">void</span> Reset();</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> Reset();</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;  State state_;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a> init_cb_;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a> new_sample_cb_;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</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="l00090"></a><span class="lineno">   90</span>&#160;  scoped_ptr&lt;DecryptorSource&gt; decryptor_source_;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;  State state_;</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704">InitCB</a> init_cb_;</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  <a class="code" href="../../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a0ac13291317f7d3d9175c4e91e57b891">NewSampleCB</a> new_sample_cb_;</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</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="l00088"></a><span class="lineno">   88</span>&#160;  std::unique_ptr&lt;DecryptorSource&gt; decryptor_source_;</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;  <a class="code" href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html">OffsetByteQueue</a> queue_;</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;  <a class="code" href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html">OffsetByteQueue</a> queue_;</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">// These two parameters are only valid in the |kEmittingSegments| state.</span></div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="comment">//</span></div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// |moof_head_| is the offset of the start of the most recently parsed moof</span></div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  <span class="comment">// block. All byte offsets in sample information are relative to this offset,</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="comment">// as mandated by the Media Source spec.</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  int64_t moof_head_;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="comment">// |mdat_tail_| is the stream offset of the end of the current &#39;mdat&#39; box.</span></div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  <span class="comment">// Valid iff it is greater than the head of the queue.</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  int64_t mdat_tail_;</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;  scoped_ptr&lt;Movie&gt; moov_;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  scoped_ptr&lt;TrackRunIterator&gt; runs_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>);</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 mp4</span></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_FORMATS_MP4_MP4_MEDIA_PARSER_H_</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#l00026">media_parser.h:26</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#l00035">media_parser.h:35</a></div></div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="comment">// These two parameters are only valid in the |kEmittingSegments| state.</span></div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  <span class="comment">//</span></div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="comment">// |moof_head_| is the offset of the start of the most recently parsed moof</span></div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  <span class="comment">// block. All byte offsets in sample information are relative to this offset,</span></div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;  <span class="comment">// as mandated by the Media Source spec.</span></div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  int64_t moof_head_;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="comment">// |mdat_tail_| is the stream offset of the end of the current &#39;mdat&#39; box.</span></div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="comment">// Valid iff it is greater than the head of the queue.</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  int64_t mdat_tail_;</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::unique_ptr&lt;Movie&gt; moov_;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  std::unique_ptr&lt;TrackRunIterator&gt; runs_;</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;  DISALLOW_COPY_AND_ASSIGN(<a class="code" href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html">MP4MediaParser</a>);</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="comment">// namespace mp4</span></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_FORMATS_MP4_MP4_MEDIA_PARSER_H_</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_1mp4_1_1MP4MediaParser_html_a6f26e0d76aeda601fa87190901de27ea"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a6f26e0d76aeda601fa87190901de27ea">shaka::media::mp4::MP4MediaParser::Flush</a></div><div class="ttdeci">bool Flush() override WARN_UNUSED_RESULT</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/def/mp4__media__parser_8cc_source.html#l00117">mp4_media_parser.cc:117</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1MP4MediaParser_html_a4105cdbe5ece03071a17c06fb27699b0"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#a4105cdbe5ece03071a17c06fb27699b0">shaka::media::mp4::MP4MediaParser::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="../../d7/def/mp4__media__parser_8cc_source.html#l00124">mp4_media_parser.cc:124</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1OffsetByteQueue_html"><div class="ttname"><a href="../../d9/df9/classshaka_1_1media_1_1OffsetByteQueue.html">shaka::media::OffsetByteQueue</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/d34/offset__byte__queue_8h_source.html#l00019">offset_byte_queue.h:19</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1mp4_1_1BoxReader_html"><div class="ttname"><a href="../../d1/dee/classshaka_1_1media_1_1mp4_1_1BoxReader.html">shaka::media::mp4::BoxReader</a></div><div class="ttdoc">Class for reading MP4 boxes. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/d92/box__reader_8h_source.html#l00024">box_reader.h:24</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#l00044">media_parser.h:44</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_1mp4_1_1MP4MediaParser_html_af0ec1b44528a2997c0d548bee47862cf"><div class="ttname"><a href="../../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#af0ec1b44528a2997c0d548bee47862cf">shaka::media::mp4::MP4MediaParser::LoadMoov</a></div><div class="ttdeci">bool LoadMoov(const std::string &amp;file_path)</div><div class="ttdef"><b>Definition:</b> <a href="../../d7/def/mp4__media__parser_8cc_source.html#l00158">mp4_media_parser.cc:158</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#l00031">key_source.h:31</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_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#l00094">mp4_media_parser.cc:94</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#l00033">mp4_media_parser.h:33</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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 23f05d6724..7f36ba0fd7 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 8c1880337f..de86dc462b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 b202a247a4..2da67007ed 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 cfc1ae443a..de9a30cf2a 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8e25a0108d..d1bd360cf8 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 82651f7e1f..377bc523bb 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 cda91e26a3..cb38e04138 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f3002b87c2..fdbce60630 100644
--- a/docs/de/dab/es__parser__h26x_8cc_source.html
+++ b/docs/de/dab/es__parser__h26x_8cc_source.html
@@ -116,306 +116,305 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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">// namespace</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;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;EsParserH26x::EsParserH26x(</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    Nalu::CodecType type,</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    scoped_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter,</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    uint32_t pid,</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb)</div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    : EsParser(pid),</div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;      emit_sample_cb_(emit_sample_cb),</div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      type_(type),</div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      es_queue_(new media::OffsetByteQueue()),</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      current_search_position_(0),</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;      stream_converter_(stream_converter.Pass()),</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      pending_sample_duration_(0),</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;      waiting_for_key_frame_(true) {}</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;EsParserH26x::~EsParserH26x() {}</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="keywordtype">bool</span> EsParserH26x::Parse(<span class="keyword">const</span> uint8_t* buf,</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                         <span class="keywordtype">int</span> size,</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                         int64_t pts,</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;                         int64_t dts) {</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="comment">// Note: Parse is invoked each time a PES packet has been reassembled.</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// Unfortunately, a PES packet does not necessarily map</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="comment">// to an h264/h265 access unit, although the HLS recommendation is to use one</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// PES for each access unit (but this is just a recommendation and some</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  <span class="comment">// streams do not comply with this recommendation).</span></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">// HLS recommendation: &quot;In AVC video, you should have both a DTS and a</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// PTS in each PES header&quot;.</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  <span class="comment">// However, some streams do not comply with this recommendation.</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  DVLOG_IF(1, pts == kNoTimestamp) &lt;&lt; <span class="stringliteral">&quot;Each video PES should have a PTS&quot;</span>;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;  <span class="keywordflow">if</span> (pts != kNoTimestamp) {</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    TimingDesc timing_desc;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    timing_desc.pts = pts;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    timing_desc.dts = (dts != kNoTimestamp) ? dts : pts;</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">// Link the end of the byte queue with the incoming timing descriptor.</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    timing_desc_list_.push_back(</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;        std::pair&lt;int64_t, TimingDesc&gt;(es_queue_-&gt;tail(), timing_desc));</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="comment">// Add the incoming bytes to the ES queue.</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;  es_queue_-&gt;Push(buf, size);</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">// We should always have entries in the vector and it should always start</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// with |can_start_access_unit == true|.  If not, we are just starting and</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="comment">// should skip to the first access unit.</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;  <span class="keywordflow">if</span> (access_unit_nalus_.empty()) {</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    <span class="keywordflow">if</span> (!SkipToFirstAccessUnit())</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</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;  DCHECK(!access_unit_nalus_.empty());</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;  DCHECK(access_unit_nalus_.front().nalu.can_start_access_unit());</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">return</span> ParseInternal();</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">void</span> EsParserH26x::Flush() {</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;EsParserH26x::Flush&quot;</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="comment">// Simulate an additional AUD to force emitting the last access unit</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="comment">// which is assumed to be complete at this point.</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;  <span class="keywordflow">if</span> (type_ == Nalu::kH264) {</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    <span class="keyword">const</span> uint8_t aud[] = {0x00, 0x00, 0x01, 0x09};</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;    es_queue_-&gt;Push(aud, <span class="keyword">sizeof</span>(aud));</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(Nalu::kH265, type_);</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    <span class="keyword">const</span> uint8_t aud[] = {0x00, 0x00, 0x01, 0x46, 0x01};</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    es_queue_-&gt;Push(aud, <span class="keyword">sizeof</span>(aud));</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;  CHECK(ParseInternal());</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">// Note that the end argument is exclusive.  We do not want to include the</span></div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="comment">// fake AUD we just added, so the argument should point to the AUD.</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;  <span class="keywordflow">if</span> (access_unit_nalus_.size() &gt; 1 &amp;&amp;</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;      !ProcessAccessUnit(access_unit_nalus_.end() - 1)) {</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Error processing last access unit.&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;</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordflow">if</span> (pending_sample_) {</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    <span class="comment">// Flush pending sample.</span></div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    DCHECK(pending_sample_duration_);</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    pending_sample_-&gt;set_duration(pending_sample_duration_);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    emit_sample_cb_.Run(pid(), pending_sample_);</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;    pending_sample_ = scoped_refptr&lt;MediaSample&gt;();</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;</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;<span class="keywordtype">void</span> EsParserH26x::Reset() {</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  es_queue_.reset(<span class="keyword">new</span> media::OffsetByteQueue());</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  current_search_position_ = 0;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  access_unit_nalus_.clear();</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  timing_desc_list_.clear();</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  pending_sample_ = scoped_refptr&lt;MediaSample&gt;();</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  pending_sample_duration_ = 0;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;  waiting_for_key_frame_ = <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">  129</span>&#160;<span class="keywordtype">bool</span> EsParserH26x::SkipToFirstAccessUnit() {</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  DCHECK(access_unit_nalus_.empty());</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;  <span class="keywordflow">while</span> (access_unit_nalus_.empty()) {</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;    <span class="keywordflow">if</span> (!SearchForNextNalu())</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</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;    <span class="comment">// If we can&#39;t start an access unit, remove it and continue.</span></div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    DCHECK_EQ(1u, access_unit_nalus_.size());</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;    <span class="keywordflow">if</span> (!access_unit_nalus_.back().nalu.can_start_access_unit())</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;      access_unit_nalus_.clear();</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="keywordflow">return</span> <span class="keyword">true</span>;</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">  143</span>&#160;<span class="keywordtype">bool</span> EsParserH26x::SearchForNextNalu() {</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;  es_queue_-&gt;PeekAt(current_search_position_, &amp;es, &amp;es_size);</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="comment">// Find a start code.</span></div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  uint64_t start_code_offset;</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  uint8_t start_code_size;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> start_code_found = NaluReader::FindStartCode(</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;      es, es_size, &amp;start_code_offset, &amp;start_code_size);</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="keywordflow">if</span> (!start_code_found) {</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    <span class="comment">// We didn&#39;t find a start code, so we don&#39;t have to search this data again.</span></div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;    <span class="keywordflow">if</span> (es_size &gt; kStartCodeSize)</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;      current_search_position_ += es_size - kStartCodeSize;</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;  <span class="comment">// Ensure the next NAL unit is a real NAL unit.</span></div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="keyword">const</span> uint8_t* nalu_ptr = es + start_code_offset + start_code_size;</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="comment">// This size is likely inaccurate, this is just to get the header info.</span></div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="keyword">const</span> int64_t next_nalu_size = es_size - start_code_offset - start_code_size;</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;  <span class="keywordflow">if</span> (next_nalu_size &lt;</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;      (type_ == Nalu::kH264 ? kH264NaluHeaderSize : kH265NaluHeaderSize)) {</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    <span class="comment">// There was not enough data, wait for more.</span></div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;  Nalu next_nalu;</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;  <span class="keywordflow">if</span> (!next_nalu.Initialize(type_, nalu_ptr, next_nalu_size)) {</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    <span class="comment">// The next NAL unit is invalid, skip it and search again.</span></div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    current_search_position_ += start_code_offset + start_code_size;</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;    <span class="keywordflow">return</span> SearchForNextNalu();</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;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;  current_search_position_ += start_code_offset + start_code_size;</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;  NaluInfo info;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  info.position = current_search_position_ - start_code_size;</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  info.start_code_size = start_code_size;</div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  info.nalu = next_nalu;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;  access_unit_nalus_.push_back(info);</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">return</span> <span class="keyword">true</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="keywordtype">bool</span> EsParserH26x::ProcessAccessUnit(std::deque&lt;NaluInfo&gt;::iterator end) {</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  DCHECK(end &lt; access_unit_nalus_.end());</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <span class="keyword">auto</span> begin = access_unit_nalus_.begin();</div>
-<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
-<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
-<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  es_queue_-&gt;PeekAt(begin-&gt;position, &amp;es, &amp;es_size);</div>
-<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;  DCHECK_GE(static_cast&lt;uint64_t&gt;(es_size), (end-&gt;position - begin-&gt;position));</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="comment">// Process the NAL units in the access unit.</span></div>
-<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordtype">bool</span> is_key_frame = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  <span class="keywordtype">int</span> pps_id = -1;</div>
-<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = begin; it != end; ++it) {</div>
-<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;    <span class="keywordflow">if</span> (it-&gt;nalu.nuh_layer_id() == 0) {</div>
-<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;      <span class="comment">// Update the NALU because the data pointer may have been invalidated.</span></div>
-<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;      CHECK(it-&gt;nalu.Initialize(</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;          type_, es + (it-&gt;position - begin-&gt;position) + it-&gt;start_code_size,</div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;          ((it+1)-&gt;position - it-&gt;position) - it-&gt;start_code_size));</div>
-<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;      <span class="keywordflow">if</span> (!ProcessNalu(it-&gt;nalu, &amp;is_key_frame, &amp;pps_id))</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;</div>
-<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;  <span class="keywordflow">if</span> (is_key_frame)</div>
-<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;    waiting_for_key_frame_ = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;  <span class="keywordflow">if</span> (!waiting_for_key_frame_) {</div>
-<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    <span class="keyword">const</span> uint64_t access_unit_size = end-&gt;position - begin-&gt;position;</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;    RCHECK(EmitFrame(begin-&gt;position, access_unit_size, is_key_frame, pps_id));</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">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="keywordtype">bool</span> EsParserH26x::ParseInternal() {</div>
-<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;  <span class="keywordflow">while</span> (<span class="keyword">true</span>) {</div>
-<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;    <span class="keywordflow">if</span> (!SearchForNextNalu())</div>
-<div class="line"><a name="l00224"></a><span class="lineno">  224</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</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="comment">// ITU H.264 sec. 7.4.1.2.3</span></div>
-<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    <span class="comment">// H264: The first of the NAL units with |can_start_access_unit() == true|</span></div>
-<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="comment">//   after the last VCL NAL unit of a primary coded picture specifies the</span></div>
-<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    <span class="comment">//   start of a new access unit. |nuh_layer_id()| is for H265 only; it is</span></div>
-<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="comment">//   included below for ease of computation (the value is always 0).</span></div>
-<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <span class="comment">// ITU H.265 sec. 7.4.2.4.4</span></div>
-<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="comment">// H265: The first of the NAL units with |can_start_access_unit() == true|</span></div>
-<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    <span class="comment">//   after the last VCL NAL unit preceding firstBlPicNalUnit (the first</span></div>
-<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    <span class="comment">//   VCL NAL unit of a coded picture with nuh_layer_id equal to 0), if</span></div>
-<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    <span class="comment">//   any, specifies the start of a new access unit.</span></div>
-<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    DCHECK(!access_unit_nalus_.empty());</div>
-<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;    <span class="keywordflow">if</span> (!access_unit_nalus_.back().nalu.is_video_slice() ||</div>
-<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;        access_unit_nalus_.back().nalu.nuh_layer_id() != 0) {</div>
-<div class="line"><a name="l00239"></a><span class="lineno">  239</span>&#160;      <span class="keywordflow">continue</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">  242</span>&#160;    <span class="comment">// First, find the end of the access unit.  Search backward to find the</span></div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="comment">// first VCL NALU before the current one.</span></div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keyword">auto</span> access_unit_end_rit = access_unit_nalus_.rbegin();</div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;    <span class="keywordtype">bool</span> found_vcl = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> rit = access_unit_nalus_.rbegin() + 1;</div>
-<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;         rit != access_unit_nalus_.rend(); ++rit) {</div>
-<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;      <span class="keywordflow">if</span> (rit-&gt;nalu.is_video_slice()) {</div>
-<div class="line"><a name="l00249"></a><span class="lineno">  249</span>&#160;        found_vcl = <span class="keyword">true</span>;</div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160;        <span class="keywordflow">break</span>;</div>
-<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (rit-&gt;nalu.can_start_access_unit()) {</div>
-<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;        <span class="comment">// The start of the next access unit is the first unit with</span></div>
-<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;        <span class="comment">// |can_start_access_unit| after the previous VCL unit.</span></div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160;        access_unit_end_rit = rit;</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;    <span class="keywordflow">if</span> (!found_vcl)</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;    <span class="comment">// Get a forward iterator that corresponds to the same element pointed by</span></div>
-<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    <span class="comment">// |access_unit_end_rit|. Note: |end| refers to the exclusive end and</span></div>
-<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;    <span class="comment">// will point to a valid object.</span></div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;    <span class="keyword">auto</span> end = (access_unit_end_rit + 1).base();</div>
-<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;    <span class="keywordflow">if</span> (!ProcessAccessUnit(end))</div>
-<div class="line"><a name="l00265"></a><span class="lineno">  265</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;    <span class="comment">// Delete the data we have already processed.</span></div>
-<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    es_queue_-&gt;Trim(end-&gt;position);</div>
-<div class="line"><a name="l00269"></a><span class="lineno">  269</span>&#160;    access_unit_nalus_.erase(access_unit_nalus_.begin(), end);</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;</div>
-<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;<span class="keywordtype">bool</span> EsParserH26x::EmitFrame(int64_t access_unit_pos,</div>
-<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;                             <span class="keywordtype">int</span> access_unit_size,</div>
-<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;                             <span class="keywordtype">bool</span> is_key_frame,</div>
-<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;                             <span class="keywordtype">int</span> pps_id) {</div>
-<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  <span class="comment">// Get the access unit timing info.</span></div>
-<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  TimingDesc current_timing_desc = {kNoTimestamp, kNoTimestamp};</div>
-<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;  <span class="keywordflow">while</span> (!timing_desc_list_.empty() &amp;&amp;</div>
-<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;         timing_desc_list_.front().first &lt;= access_unit_pos) {</div>
-<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;    current_timing_desc = timing_desc_list_.front().second;</div>
-<div class="line"><a name="l00282"></a><span class="lineno">  282</span>&#160;    timing_desc_list_.pop_front();</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> (current_timing_desc.pts == kNoTimestamp)</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;  <span class="comment">// Emit a frame.</span></div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;  DVLOG(LOG_LEVEL_ES) &lt;&lt; <span class="stringliteral">&quot;Emit frame: stream_pos=&quot;</span> &lt;&lt; access_unit_pos</div>
-<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;                      &lt;&lt; <span class="stringliteral">&quot; size=&quot;</span> &lt;&lt; access_unit_size;</div>
-<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
-<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
-<div class="line"><a name="l00292"></a><span class="lineno">  292</span>&#160;  es_queue_-&gt;PeekAt(access_unit_pos, &amp;es, &amp;es_size);</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="comment">// Convert frame to unit stream format.</span></div>
-<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  std::vector&lt;uint8_t&gt; converted_frame;</div>
-<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;  <span class="keywordflow">if</span> (!stream_converter_-&gt;ConvertByteStreamToNalUnitStream(</div>
-<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;          es, access_unit_size, &amp;converted_frame)) {</div>
-<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    DLOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failure to convert video frame to unit stream format.&quot;</span>;</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</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;</div>
-<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  <span class="comment">// Update the video decoder configuration if needed.</span></div>
-<div class="line"><a name="l00303"></a><span class="lineno">  303</span>&#160;  RCHECK(UpdateVideoDecoderConfig(pps_id));</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">// Create the media sample, emitting always the previous sample after</span></div>
-<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  <span class="comment">// calculating its duration.</span></div>
-<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;  scoped_refptr&lt;MediaSample&gt; media_sample = <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">MediaSample::CopyFrom</a>(</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;      converted_frame.data(), converted_frame.size(), is_key_frame);</div>
-<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;  media_sample-&gt;set_dts(current_timing_desc.dts);</div>
-<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  media_sample-&gt;set_pts(current_timing_desc.pts);</div>
-<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;  <span class="keywordflow">if</span> (pending_sample_) {</div>
-<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    DCHECK_GT(media_sample-&gt;dts(), pending_sample_-&gt;dts());</div>
-<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    pending_sample_duration_ = media_sample-&gt;dts() - pending_sample_-&gt;dts();</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;    pending_sample_-&gt;set_duration(pending_sample_duration_);</div>
-<div class="line"><a name="l00315"></a><span class="lineno">  315</span>&#160;    emit_sample_cb_.Run(pid(), pending_sample_);</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;  pending_sample_ = media_sample;</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> <span class="keyword">true</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">// namespace mp2t</span></div>
-<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;}  <span class="comment">// namespace media</span></div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160;}  <span class="comment">// namespace shaka</span></div>
+<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;EsParserH26x::EsParserH26x(</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    Nalu::CodecType type,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;    std::unique_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter,</div>
+<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;    uint32_t pid,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb)</div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    : EsParser(pid),</div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;      emit_sample_cb_(emit_sample_cb),</div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;      type_(type),</div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;      es_queue_(new media::OffsetByteQueue()),</div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;      current_search_position_(0),</div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;      stream_converter_(std::move(stream_converter)),</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;      pending_sample_duration_(0),</div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;      waiting_for_key_frame_(true) {}</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;EsParserH26x::~EsParserH26x() {}</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> EsParserH26x::Parse(<span class="keyword">const</span> uint8_t* buf,</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;                         <span class="keywordtype">int</span> size,</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                         int64_t pts,</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;                         int64_t dts) {</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;  <span class="comment">// Note: Parse is invoked each time a PES packet has been reassembled.</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;  <span class="comment">// Unfortunately, a PES packet does not necessarily map</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;  <span class="comment">// to an h264/h265 access unit, although the HLS recommendation is to use one</span></div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;  <span class="comment">// PES for each access unit (but this is just a recommendation and some</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="comment">// streams do not comply with this recommendation).</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;  <span class="comment">// HLS recommendation: &quot;In AVC video, you should have both a DTS and a</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="comment">// PTS in each PES header&quot;.</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;  <span class="comment">// However, some streams do not comply with this recommendation.</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;  DVLOG_IF(1, pts == kNoTimestamp) &lt;&lt; <span class="stringliteral">&quot;Each video PES should have a PTS&quot;</span>;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordflow">if</span> (pts != kNoTimestamp) {</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    TimingDesc timing_desc;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    timing_desc.pts = pts;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    timing_desc.dts = (dts != kNoTimestamp) ? dts : pts;</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">// Link the end of the byte queue with the incoming timing descriptor.</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    timing_desc_list_.push_back(</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;        std::pair&lt;int64_t, TimingDesc&gt;(es_queue_-&gt;tail(), timing_desc));</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="comment">// Add the incoming bytes to the ES queue.</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;  es_queue_-&gt;Push(buf, size);</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">// We should always have entries in the vector and it should always start</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;  <span class="comment">// with |can_start_access_unit == true|.  If not, we are just starting and</span></div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;  <span class="comment">// should skip to the first access unit.</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;  <span class="keywordflow">if</span> (access_unit_nalus_.empty()) {</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    <span class="keywordflow">if</span> (!SkipToFirstAccessUnit())</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</span>;</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;  DCHECK(!access_unit_nalus_.empty());</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  DCHECK(access_unit_nalus_.front().nalu.can_start_access_unit());</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">return</span> ParseInternal();</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">   86</span>&#160;<span class="keywordtype">void</span> EsParserH26x::Flush() {</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;  DVLOG(1) &lt;&lt; <span class="stringliteral">&quot;EsParserH26x::Flush&quot;</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;  <span class="comment">// Simulate an additional AUD to force emitting the last access unit</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;  <span class="comment">// which is assumed to be complete at this point.</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;  <span class="keywordflow">if</span> (type_ == Nalu::kH264) {</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keyword">const</span> uint8_t aud[] = {0x00, 0x00, 0x01, 0x09};</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;    es_queue_-&gt;Push(aud, <span class="keyword">sizeof</span>(aud));</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  } <span class="keywordflow">else</span> {</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    DCHECK_EQ(Nalu::kH265, type_);</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    <span class="keyword">const</span> uint8_t aud[] = {0x00, 0x00, 0x01, 0x46, 0x01};</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    es_queue_-&gt;Push(aud, <span class="keyword">sizeof</span>(aud));</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;  CHECK(ParseInternal());</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">// Note that the end argument is exclusive.  We do not want to include the</span></div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  <span class="comment">// fake AUD we just added, so the argument should point to the AUD.</span></div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  <span class="keywordflow">if</span> (access_unit_nalus_.size() &gt; 1 &amp;&amp;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;      !ProcessAccessUnit(access_unit_nalus_.end() - 1)) {</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    LOG(WARNING) &lt;&lt; <span class="stringliteral">&quot;Error processing last access unit.&quot;</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="keywordflow">if</span> (pending_sample_) {</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    <span class="comment">// Flush pending sample.</span></div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    DCHECK(pending_sample_duration_);</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    pending_sample_-&gt;set_duration(pending_sample_duration_);</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;    emit_sample_cb_.Run(pid(), pending_sample_);</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;    pending_sample_ = scoped_refptr&lt;MediaSample&gt;();</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;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;<span class="keywordtype">void</span> EsParserH26x::Reset() {</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;  es_queue_.reset(<span class="keyword">new</span> media::OffsetByteQueue());</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;  current_search_position_ = 0;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;  access_unit_nalus_.clear();</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;  timing_desc_list_.clear();</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;  pending_sample_ = scoped_refptr&lt;MediaSample&gt;();</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;  pending_sample_duration_ = 0;</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;  waiting_for_key_frame_ = <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">bool</span> EsParserH26x::SkipToFirstAccessUnit() {</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;  DCHECK(access_unit_nalus_.empty());</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;  <span class="keywordflow">while</span> (access_unit_nalus_.empty()) {</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;    <span class="keywordflow">if</span> (!SearchForNextNalu())</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;    <span class="comment">// If we can&#39;t start an access unit, remove it and continue.</span></div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;    DCHECK_EQ(1u, access_unit_nalus_.size());</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;    <span class="keywordflow">if</span> (!access_unit_nalus_.back().nalu.can_start_access_unit())</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;      access_unit_nalus_.clear();</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="keywordflow">return</span> <span class="keyword">true</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> EsParserH26x::SearchForNextNalu() {</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;  es_queue_-&gt;PeekAt(current_search_position_, &amp;es, &amp;es_size);</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">// Find a start code.</span></div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;  uint64_t start_code_offset;</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;  uint8_t start_code_size;</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;  <span class="keyword">const</span> <span class="keywordtype">bool</span> start_code_found = NaluReader::FindStartCode(</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;      es, es_size, &amp;start_code_offset, &amp;start_code_size);</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="keywordflow">if</span> (!start_code_found) {</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;    <span class="comment">// We didn&#39;t find a start code, so we don&#39;t have to search this data again.</span></div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;    <span class="keywordflow">if</span> (es_size &gt; kStartCodeSize)</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;      current_search_position_ += es_size - kStartCodeSize;</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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="comment">// Ensure the next NAL unit is a real NAL unit.</span></div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;  <span class="keyword">const</span> uint8_t* nalu_ptr = es + start_code_offset + start_code_size;</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;  <span class="comment">// This size is likely inaccurate, this is just to get the header info.</span></div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;  <span class="keyword">const</span> int64_t next_nalu_size = es_size - start_code_offset - start_code_size;</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;  <span class="keywordflow">if</span> (next_nalu_size &lt;</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;      (type_ == Nalu::kH264 ? kH264NaluHeaderSize : kH265NaluHeaderSize)) {</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;    <span class="comment">// There was not enough data, wait for more.</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;  Nalu next_nalu;</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;  <span class="keywordflow">if</span> (!next_nalu.Initialize(type_, nalu_ptr, next_nalu_size)) {</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    <span class="comment">// The next NAL unit is invalid, skip it and search again.</span></div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    current_search_position_ += start_code_offset + start_code_size;</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;    <span class="keywordflow">return</span> SearchForNextNalu();</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;</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;  current_search_position_ += start_code_offset + start_code_size;</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;  NaluInfo info;</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;  info.position = current_search_position_ - start_code_size;</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;  info.start_code_size = start_code_size;</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;  info.nalu = next_nalu;</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;  access_unit_nalus_.push_back(info);</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">return</span> <span class="keyword">true</span>;</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">  188</span>&#160;<span class="keywordtype">bool</span> EsParserH26x::ProcessAccessUnit(std::deque&lt;NaluInfo&gt;::iterator end) {</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;  DCHECK(end &lt; access_unit_nalus_.end());</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;  <span class="keyword">auto</span> begin = access_unit_nalus_.begin();</div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;  es_queue_-&gt;PeekAt(begin-&gt;position, &amp;es, &amp;es_size);</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;  DCHECK_GE(static_cast&lt;uint64_t&gt;(es_size), (end-&gt;position - begin-&gt;position));</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="comment">// Process the NAL units in the access unit.</span></div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;  <span class="keywordtype">bool</span> is_key_frame = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;  <span class="keywordtype">int</span> pps_id = -1;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;  <span class="keywordflow">for</span> (<span class="keyword">auto</span> it = begin; it != end; ++it) {</div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;    <span class="keywordflow">if</span> (it-&gt;nalu.nuh_layer_id() == 0) {</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;      <span class="comment">// Update the NALU because the data pointer may have been invalidated.</span></div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;      CHECK(it-&gt;nalu.Initialize(</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;          type_, es + (it-&gt;position - begin-&gt;position) + it-&gt;start_code_size,</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;          ((it+1)-&gt;position - it-&gt;position) - it-&gt;start_code_size));</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;      <span class="keywordflow">if</span> (!ProcessNalu(it-&gt;nalu, &amp;is_key_frame, &amp;pps_id))</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;        <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;  }</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> (is_key_frame)</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;    waiting_for_key_frame_ = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;  <span class="keywordflow">if</span> (!waiting_for_key_frame_) {</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;    <span class="keyword">const</span> uint64_t access_unit_size = end-&gt;position - begin-&gt;position;</div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;    RCHECK(EmitFrame(begin-&gt;position, access_unit_size, is_key_frame, pps_id));</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="keywordflow">return</span> <span class="keyword">true</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">  220</span>&#160;<span class="keywordtype">bool</span> EsParserH26x::ParseInternal() {</div>
+<div class="line"><a name="l00221"></a><span class="lineno">  221</span>&#160;  <span class="keywordflow">while</span> (<span class="keyword">true</span>) {</div>
+<div class="line"><a name="l00222"></a><span class="lineno">  222</span>&#160;    <span class="keywordflow">if</span> (!SearchForNextNalu())</div>
+<div class="line"><a name="l00223"></a><span class="lineno">  223</span>&#160;      <span class="keywordflow">return</span> <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;    <span class="comment">// ITU H.264 sec. 7.4.1.2.3</span></div>
+<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160;    <span class="comment">// H264: The first of the NAL units with |can_start_access_unit() == true|</span></div>
+<div class="line"><a name="l00227"></a><span class="lineno">  227</span>&#160;    <span class="comment">//   after the last VCL NAL unit of a primary coded picture specifies the</span></div>
+<div class="line"><a name="l00228"></a><span class="lineno">  228</span>&#160;    <span class="comment">//   start of a new access unit. |nuh_layer_id()| is for H265 only; it is</span></div>
+<div class="line"><a name="l00229"></a><span class="lineno">  229</span>&#160;    <span class="comment">//   included below for ease of computation (the value is always 0).</span></div>
+<div class="line"><a name="l00230"></a><span class="lineno">  230</span>&#160;    <span class="comment">// ITU H.265 sec. 7.4.2.4.4</span></div>
+<div class="line"><a name="l00231"></a><span class="lineno">  231</span>&#160;    <span class="comment">// H265: The first of the NAL units with |can_start_access_unit() == true|</span></div>
+<div class="line"><a name="l00232"></a><span class="lineno">  232</span>&#160;    <span class="comment">//   after the last VCL NAL unit preceding firstBlPicNalUnit (the first</span></div>
+<div class="line"><a name="l00233"></a><span class="lineno">  233</span>&#160;    <span class="comment">//   VCL NAL unit of a coded picture with nuh_layer_id equal to 0), if</span></div>
+<div class="line"><a name="l00234"></a><span class="lineno">  234</span>&#160;    <span class="comment">//   any, specifies the start of a new access unit.</span></div>
+<div class="line"><a name="l00235"></a><span class="lineno">  235</span>&#160;    DCHECK(!access_unit_nalus_.empty());</div>
+<div class="line"><a name="l00236"></a><span class="lineno">  236</span>&#160;    <span class="keywordflow">if</span> (!access_unit_nalus_.back().nalu.is_video_slice() ||</div>
+<div class="line"><a name="l00237"></a><span class="lineno">  237</span>&#160;        access_unit_nalus_.back().nalu.nuh_layer_id() != 0) {</div>
+<div class="line"><a name="l00238"></a><span class="lineno">  238</span>&#160;      <span class="keywordflow">continue</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">// First, find the end of the access unit.  Search backward to find the</span></div>
+<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160;    <span class="comment">// first VCL NALU before the current one.</span></div>
+<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;    <span class="keyword">auto</span> access_unit_end_rit = access_unit_nalus_.rbegin();</div>
+<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;    <span class="keywordtype">bool</span> found_vcl = <span class="keyword">false</span>;</div>
+<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;    <span class="keywordflow">for</span> (<span class="keyword">auto</span> rit = access_unit_nalus_.rbegin() + 1;</div>
+<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160;         rit != access_unit_nalus_.rend(); ++rit) {</div>
+<div class="line"><a name="l00247"></a><span class="lineno">  247</span>&#160;      <span class="keywordflow">if</span> (rit-&gt;nalu.is_video_slice()) {</div>
+<div class="line"><a name="l00248"></a><span class="lineno">  248</span>&#160;        found_vcl = <span class="keyword">true</span>;</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;      } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (rit-&gt;nalu.can_start_access_unit()) {</div>
+<div class="line"><a name="l00251"></a><span class="lineno">  251</span>&#160;        <span class="comment">// The start of the next access unit is the first unit with</span></div>
+<div class="line"><a name="l00252"></a><span class="lineno">  252</span>&#160;        <span class="comment">// |can_start_access_unit| after the previous VCL unit.</span></div>
+<div class="line"><a name="l00253"></a><span class="lineno">  253</span>&#160;        access_unit_end_rit = rit;</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="keywordflow">if</span> (!found_vcl)</div>
+<div class="line"><a name="l00257"></a><span class="lineno">  257</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">true</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">// Get a forward iterator that corresponds to the same element pointed by</span></div>
+<div class="line"><a name="l00260"></a><span class="lineno">  260</span>&#160;    <span class="comment">// |access_unit_end_rit|. Note: |end| refers to the exclusive end and</span></div>
+<div class="line"><a name="l00261"></a><span class="lineno">  261</span>&#160;    <span class="comment">// will point to a valid object.</span></div>
+<div class="line"><a name="l00262"></a><span class="lineno">  262</span>&#160;    <span class="keyword">auto</span> end = (access_unit_end_rit + 1).base();</div>
+<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160;    <span class="keywordflow">if</span> (!ProcessAccessUnit(end))</div>
+<div class="line"><a name="l00264"></a><span class="lineno">  264</span>&#160;      <span class="keywordflow">return</span> <span class="keyword">false</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;    <span class="comment">// Delete the data we have already processed.</span></div>
+<div class="line"><a name="l00267"></a><span class="lineno">  267</span>&#160;    es_queue_-&gt;Trim(end-&gt;position);</div>
+<div class="line"><a name="l00268"></a><span class="lineno">  268</span>&#160;    access_unit_nalus_.erase(access_unit_nalus_.begin(), end);</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="keywordtype">bool</span> EsParserH26x::EmitFrame(int64_t access_unit_pos,</div>
+<div class="line"><a name="l00273"></a><span class="lineno">  273</span>&#160;                             <span class="keywordtype">int</span> access_unit_size,</div>
+<div class="line"><a name="l00274"></a><span class="lineno">  274</span>&#160;                             <span class="keywordtype">bool</span> is_key_frame,</div>
+<div class="line"><a name="l00275"></a><span class="lineno">  275</span>&#160;                             <span class="keywordtype">int</span> pps_id) {</div>
+<div class="line"><a name="l00276"></a><span class="lineno">  276</span>&#160;  <span class="comment">// Get the access unit timing info.</span></div>
+<div class="line"><a name="l00277"></a><span class="lineno">  277</span>&#160;  TimingDesc current_timing_desc = {kNoTimestamp, kNoTimestamp};</div>
+<div class="line"><a name="l00278"></a><span class="lineno">  278</span>&#160;  <span class="keywordflow">while</span> (!timing_desc_list_.empty() &amp;&amp;</div>
+<div class="line"><a name="l00279"></a><span class="lineno">  279</span>&#160;         timing_desc_list_.front().first &lt;= access_unit_pos) {</div>
+<div class="line"><a name="l00280"></a><span class="lineno">  280</span>&#160;    current_timing_desc = timing_desc_list_.front().second;</div>
+<div class="line"><a name="l00281"></a><span class="lineno">  281</span>&#160;    timing_desc_list_.pop_front();</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">if</span> (current_timing_desc.pts == kNoTimestamp)</div>
+<div class="line"><a name="l00284"></a><span class="lineno">  284</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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">// Emit a frame.</span></div>
+<div class="line"><a name="l00287"></a><span class="lineno">  287</span>&#160;  DVLOG(LOG_LEVEL_ES) &lt;&lt; <span class="stringliteral">&quot;Emit frame: stream_pos=&quot;</span> &lt;&lt; access_unit_pos</div>
+<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160;                      &lt;&lt; <span class="stringliteral">&quot; size=&quot;</span> &lt;&lt; access_unit_size;</div>
+<div class="line"><a name="l00289"></a><span class="lineno">  289</span>&#160;  <span class="keywordtype">int</span> es_size;</div>
+<div class="line"><a name="l00290"></a><span class="lineno">  290</span>&#160;  <span class="keyword">const</span> uint8_t* es;</div>
+<div class="line"><a name="l00291"></a><span class="lineno">  291</span>&#160;  es_queue_-&gt;PeekAt(access_unit_pos, &amp;es, &amp;es_size);</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="comment">// Convert frame to unit stream format.</span></div>
+<div class="line"><a name="l00294"></a><span class="lineno">  294</span>&#160;  std::vector&lt;uint8_t&gt; converted_frame;</div>
+<div class="line"><a name="l00295"></a><span class="lineno">  295</span>&#160;  <span class="keywordflow">if</span> (!stream_converter_-&gt;ConvertByteStreamToNalUnitStream(</div>
+<div class="line"><a name="l00296"></a><span class="lineno">  296</span>&#160;          es, access_unit_size, &amp;converted_frame)) {</div>
+<div class="line"><a name="l00297"></a><span class="lineno">  297</span>&#160;    DLOG(ERROR) &lt;&lt; <span class="stringliteral">&quot;Failure to convert video frame to unit stream format.&quot;</span>;</div>
+<div class="line"><a name="l00298"></a><span class="lineno">  298</span>&#160;    <span class="keywordflow">return</span> <span class="keyword">false</span>;</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;</div>
+<div class="line"><a name="l00301"></a><span class="lineno">  301</span>&#160;  <span class="comment">// Update the video decoder configuration if needed.</span></div>
+<div class="line"><a name="l00302"></a><span class="lineno">  302</span>&#160;  RCHECK(UpdateVideoDecoderConfig(pps_id));</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">// Create the media sample, emitting always the previous sample after</span></div>
+<div class="line"><a name="l00305"></a><span class="lineno">  305</span>&#160;  <span class="comment">// calculating its duration.</span></div>
+<div class="line"><a name="l00306"></a><span class="lineno">  306</span>&#160;  scoped_refptr&lt;MediaSample&gt; media_sample = <a class="code" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b">MediaSample::CopyFrom</a>(</div>
+<div class="line"><a name="l00307"></a><span class="lineno">  307</span>&#160;      converted_frame.data(), converted_frame.size(), is_key_frame);</div>
+<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160;  media_sample-&gt;set_dts(current_timing_desc.dts);</div>
+<div class="line"><a name="l00309"></a><span class="lineno">  309</span>&#160;  media_sample-&gt;set_pts(current_timing_desc.pts);</div>
+<div class="line"><a name="l00310"></a><span class="lineno">  310</span>&#160;  <span class="keywordflow">if</span> (pending_sample_) {</div>
+<div class="line"><a name="l00311"></a><span class="lineno">  311</span>&#160;    DCHECK_GT(media_sample-&gt;dts(), pending_sample_-&gt;dts());</div>
+<div class="line"><a name="l00312"></a><span class="lineno">  312</span>&#160;    pending_sample_duration_ = media_sample-&gt;dts() - pending_sample_-&gt;dts();</div>
+<div class="line"><a name="l00313"></a><span class="lineno">  313</span>&#160;    pending_sample_-&gt;set_duration(pending_sample_duration_);</div>
+<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160;    emit_sample_cb_.Run(pid(), pending_sample_);</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;  pending_sample_ = media_sample;</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;  <span class="keywordflow">return</span> <span class="keyword">true</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;</div>
+<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160;}  <span class="comment">// namespace mp2t</span></div>
+<div class="line"><a name="l00322"></a><span class="lineno">  322</span>&#160;}  <span class="comment">// namespace media</span></div>
+<div class="line"><a name="l00323"></a><span class="lineno">  323</span>&#160;}  <span class="comment">// namespace shaka</span></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><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 4ea2c5af00..1e14099f4b 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 53592a4f29..c3a2d5a15d 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 6b24a3ef34..1eac49805c 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fdd9236513..0e11f4a391 100644
--- a/docs/de/dc1/demuxer_8h_source.html
+++ b/docs/de/dc1/demuxer_8h_source.html
@@ -97,11 +97,11 @@ 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_DEMUXER_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;deque&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/base/compiler_specific.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/scoped_ptr.h&quot;</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;<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/base/compiler_specific.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/media/base/container_names.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/status.h&quot;</span></div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
@@ -121,7 +121,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keyword">explicit</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#ae2fee69f99e5815de4f686b24393402e">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;  ~<a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html">Demuxer</a>();</div>
 <div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">SetKeySource</a>(scoped_ptr&lt;KeySource&gt; key_source);</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">SetKeySource</a>(std::unique_ptr&lt;KeySource&gt; key_source);</div>
 <div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
 <div class="line"><a name="l00051"></a><span class="lineno">   51</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">Initialize</a>();</div>
 <div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
@@ -160,11 +160,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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;  scoped_ptr&lt;MediaParser&gt; parser_;</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;  scoped_ptr&lt;uint8_t[]&gt; buffer_;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  scoped_ptr&lt;KeySource&gt; key_source_;</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>
@@ -174,11 +174,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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_acad9afa8ef3b5682324a4ded402ab93a"><div class="ttname"><a href="../../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">shaka::media::Demuxer::SetKeySource</a></div><div class="ttdeci">void SetKeySource(scoped_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_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="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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b6b5e5c256..9b6321489f 100644
--- a/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html
+++ b/docs/de/dc2/classshaka_1_1media_1_1H265Parser.html
@@ -256,7 +256,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 72ff0d2376..e659e2276c 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 4b44fc04f6..5983a8acbb 100644
--- a/docs/de/dcb/ts__segmenter_8h_source.html
+++ b/docs/de/dcb/ts__segmenter_8h_source.html
@@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SEGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SEGMENTER_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 &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/media/base/media_stream.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/muxer_options.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/status.h&quot;</span></div>
@@ -130,10 +130,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a5fc925f3324b5cfab955b1fac1f52094">AddSample</a>(scoped_refptr&lt;MediaSample&gt; sample);</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="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">InjectTsWriterForTesting</a>(scoped_ptr&lt;TsWriter&gt; writer);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">InjectTsWriterForTesting</a>(std::unique_ptr&lt;TsWriter&gt; writer);</div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">InjectPesPacketGeneratorForTesting</a>(</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      scoped_ptr&lt;PesPacketGenerator&gt; generator);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">InjectPesPacketGeneratorForTesting</a>(</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;      std::unique_ptr&lt;PesPacketGenerator&gt; generator);</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keywordtype">void</span> <a class="code" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">SetTsWriterFileOpenedForTesting</a>(<span class="keywordtype">bool</span> value);</div>
 <div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
@@ -168,11 +168,11 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  <span class="comment">// Used for segment template.</span></div>
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;  uint64_t segment_number_ = 0;</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;  scoped_ptr&lt;TsWriter&gt; ts_writer_;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;  std::unique_ptr&lt;TsWriter&gt; ts_writer_;</div>
 <div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;  <span class="comment">// Set to true if TsWriter::NewFile() succeeds, set to false after</span></div>
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  <span class="comment">// TsWriter::FinalizeFile() succeeds.</span></div>
 <div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;  <span class="keywordtype">bool</span> ts_writer_file_opened_ = <span class="keyword">false</span>;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  scoped_ptr&lt;PesPacketGenerator&gt; pes_packet_generator_;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;  std::unique_ptr&lt;PesPacketGenerator&gt; pes_packet_generator_;</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">// For OnNewSegment().</span></div>
 <div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;  uint64_t current_segment_start_time_ = 0;</div>
@@ -180,7 +180,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  <span class="comment">// the segment has been finalized.</span></div>
 <div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  std::string current_segment_path_;</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;  scoped_ptr&lt;EncryptionKey&gt; encryption_key_;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  std::unique_ptr&lt;EncryptionKey&gt; encryption_key_;</div>
 <div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keywordtype">double</span> clear_lead_in_seconds_ = 0;</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="comment">// The total duration of the segments that it has segmented. This only</span></div>
@@ -199,19 +199,19 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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>
 <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_1mp2t_1_1TsSegmenter_html_a2bf9d53ebc0a42551e7c460d9464650d"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">shaka::media::mp2t::TsSegmenter::InjectTsWriterForTesting</a></div><div class="ttdeci">void InjectTsWriterForTesting(scoped_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>
 <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="classshaka_1_1media_1_1mp2t_1_1TsSegmenter_html"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html">shaka::media::mp2t::TsSegmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../de/dcb/ts__segmenter_8h_source.html#l00029">ts_segmenter.h:29</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_a01c6ce7398b8e7a9966959dadcd30b25"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">shaka::media::mp2t::TsSegmenter::InjectPesPacketGeneratorForTesting</a></div><div class="ttdeci">void InjectPesPacketGeneratorForTesting(scoped_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_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>
 <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#l00031">key_source.h:31</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_1TsSegmenter_html_a412be69ae8e18c5ceb3c48d1559c79c2"><div class="ttname"><a href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2">shaka::media::mp2t::TsSegmenter::Initialize</a></div><div class="ttdeci">Status Initialize(const StreamInfo &amp;stream_info, KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds)</div><div class="ttdef"><b>Definition:</b> <a href="../../d6/de9/ts__segmenter_8cc_source.html#l00034">ts_segmenter.cc:34</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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 391d6c93b3..50f445aeca 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 6275c599dd..38e04b50ae 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 0a61d62dc3..ff5a4ffa9a 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 eac5a71f1d..3e8c7f2080 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 853f65e3fb..6d57c31ced 100644
--- a/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html
+++ b/docs/de/ddd/classshaka_1_1media_1_1Muxer-members.html
@@ -109,14 +109,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Run</a>()</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68">set_clock</a>(base::Clock *clock)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">SetKeySource</a>(KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a>(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a>(scoped_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a>(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a>(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>streams</b>() const  (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~Muxer</b>() (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 f659ce8d7d..8a898b5ada 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
@@ -104,14 +104,14 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:ac92da7c996e2a270fd704facc8f7a149"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5fc925f3324b5cfab955b1fac1f52094"><td class="memItemLeft" align="right" valign="top"><a class="el" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a5fc925f3324b5cfab955b1fac1f52094">AddSample</a> (scoped_refptr&lt; <a class="el" href="../../d7/d6d/classshaka_1_1media_1_1MediaSample.html">MediaSample</a> &gt; sample)</td></tr>
 <tr class="separator:a5fc925f3324b5cfab955b1fac1f52094"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2bf9d53ebc0a42551e7c460d9464650d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2bf9d53ebc0a42551e7c460d9464650d"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">InjectTsWriterForTesting</a> (scoped_ptr&lt; <a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">TsWriter</a> &gt; writer)</td></tr>
-<tr class="memdesc:a2bf9d53ebc0a42551e7c460d9464650d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
-<tr class="separator:a2bf9d53ebc0a42551e7c460d9464650d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a01c6ce7398b8e7a9966959dadcd30b25"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a01c6ce7398b8e7a9966959dadcd30b25"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">InjectPesPacketGeneratorForTesting</a> (scoped_ptr&lt; <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a> &gt; generator)</td></tr>
-<tr class="memdesc:a01c6ce7398b8e7a9966959dadcd30b25"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
-<tr class="separator:a01c6ce7398b8e7a9966959dadcd30b25"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae3ed0f86d2163444e24a2577e35517a9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae3ed0f86d2163444e24a2577e35517a9"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">InjectTsWriterForTesting</a> (std::unique_ptr&lt; <a class="el" href="../../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html">TsWriter</a> &gt; writer)</td></tr>
+<tr class="memdesc:ae3ed0f86d2163444e24a2577e35517a9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
+<tr class="separator:ae3ed0f86d2163444e24a2577e35517a9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:abb78b18426643d58bc44ea61823dc29c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abb78b18426643d58bc44ea61823dc29c"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">InjectPesPacketGeneratorForTesting</a> (std::unique_ptr&lt; <a class="el" href="../../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html">PesPacketGenerator</a> &gt; generator)</td></tr>
+<tr class="memdesc:abb78b18426643d58bc44ea61823dc29c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
+<tr class="separator:abb78b18426643d58bc44ea61823dc29c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a34ab9fbaee43115d68be87e4b9e90918"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a34ab9fbaee43115d68be87e4b9e90918"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918">SetTsWriterFileOpenedForTesting</a> (bool value)</td></tr>
 <tr class="memdesc:a34ab9fbaee43115d68be87e4b9e90918"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only for testing. <br/></td></tr>
@@ -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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 92b3a0dba8..4691374bae 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 84a0db6692..1e1f8b8ef7 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 3e707b4074..dd20baccec 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
@@ -109,15 +109,15 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f">Run</a>()</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68">set_clock</a>(base::Clock *clock)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">SetKeySource</a>(KeySource *encryption_key_source, uint32_t max_sd_pixels, double clear_lead_in_seconds, double crypto_period_duration_in_seconds, FourCC protection_scheme)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a>(scoped_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a>(scoped_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a>(std::unique_ptr&lt; MuxerListener &gt; muxer_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a>(std::unique_ptr&lt; ProgressListener &gt; progress_listener)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>streams</b>() const  (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~MP4Muxer</b>() override (defined in <a class="el" href="../../db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html">shaka::media::mp4::MP4Muxer</a>)</td><td class="entry"><a class="el" href="../../db/d30/classshaka_1_1media_1_1mp4_1_1MP4Muxer.html">shaka::media::mp4::MP4Muxer</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~Muxer</b>() (defined in <a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a>)</td><td class="entry"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html">shaka::media::Muxer</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 9e8b9876f9..ce190266c9 100644
--- a/docs/de/de4/structshaka_1_1media_1_1H264Pps.html
+++ b/docs/de/de4/structshaka_1_1media_1_1H264Pps.html
@@ -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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 fe988e6d91..58467a59cb 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 5e0311a9cf..aac6abfa24 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 dc0d5b4393..6b67ea6482 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
@@ -124,8 +124,8 @@ const <a class="el" href="../../d8/d5b/structshaka_1_1media_1_1mp4_1_1AudioSampl
 const <a class="el" href="../../d0/d73/structshaka_1_1media_1_1mp4_1_1VideoSampleEntry.html">VideoSampleEntry</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#aee813f01267e89ff00fdb836bb3a159d">video_description</a> () const </td></tr>
 <tr class="memdesc:aee813f01267e89ff00fdb836bb3a159d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Only valid if is_video() is true. <br/></td></tr>
 <tr class="separator:aee813f01267e89ff00fdb836bb3a159d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a1badd6160074e1bc2ef0f1e289a81524"><td class="memItemLeft" align="right" valign="top">scoped_ptr&lt; <a class="el" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">GetDecryptConfig</a> ()</td></tr>
-<tr class="separator:a1badd6160074e1bc2ef0f1e289a81524"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af1dbb0a9037617c2b80506ee161dfcfa"><td class="memItemLeft" align="right" valign="top">std::unique_ptr&lt; <a class="el" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">GetDecryptConfig</a> ()</td></tr>
+<tr class="separator:af1dbb0a9037617c2b80506ee161dfcfa"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr><td colspan="2"><div class="groupHeader">Properties of the current run. Only valid if IsRunValid().</div></td></tr>
 <tr class="memitem:a9991b5bbc78141a8db7da362c250a8fc"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9991b5bbc78141a8db7da362c250a8fc"></a>
 uint32_t&#160;</td><td class="memItemRight" valign="bottom"><b>track_id</b> () const </td></tr>
@@ -294,12 +294,12 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>is_keyframe</b> () co
 
 </div>
 </div>
-<a class="anchor" id="a1badd6160074e1bc2ef0f1e289a81524"></a>
+<a class="anchor" id="af1dbb0a9037617c2b80506ee161dfcfa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">scoped_ptr&lt; <a class="el" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a> &gt; shaka::media::mp4::TrackRunIterator::GetDecryptConfig </td>
+          <td class="memname">std::unique_ptr&lt; <a class="el" href="../../de/d49/classshaka_1_1media_1_1DecryptConfig.html">DecryptConfig</a> &gt; shaka::media::mp4::TrackRunIterator::GetDecryptConfig </td>
           <td>(</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 81b48422ac..975d9ed606 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
@@ -108,7 +108,7 @@ Public Member Functions</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>A helper class used to encrypt WebM frames before being written to the <a class="el" href="../../d1/dd5/classshaka_1_1media_1_1Cluster.html">Cluster</a>. This can also handle unencrypted frames. </p>
 
-<p>Definition at line <a class="el" href="../../dd/d42/encryptor_8h_source.html#l00029">29</a> of file <a class="el" href="../../dd/d42/encryptor_8h_source.html">encryptor.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/d42/encryptor_8h_source.html#l00030">30</a> of file <a class="el" href="../../dd/d42/encryptor_8h_source.html">encryptor.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a866bb619cd0fde0c28ee522cbd4a8c59"></a>
 <div class="memitem">
@@ -215,7 +215,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f58483272e..f7715376b6 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 8a7319dc14..40329fc909 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 2ca8c5896b..8ff2f40763 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 4acbe8d7ca..f9205b5f22 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 b5cb6b4a59..92b601ae74 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 15585a834d..b044a40b11 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 861ede15b9..92db8307c5 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 147b552b5c..a0b24ebf18 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 b4500d0bd6..bea451fb55 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 d08557943d..41c33a7459 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 24cf06827d..2dac9b6b4c 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 1f673a0164..276e2b3a41 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 fc2fa7bcc8..5aafe8702c 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 32ed1bb845..705be898a4 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 bb70c2f31e..9ad7d4e4e5 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 229f712770..7fab360092 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 c153cd1132..2521254bab 100644
--- a/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html
+++ b/docs/df/d3c/classshaka_1_1media_1_1RequestSigner.html
@@ -127,7 +127,7 @@ Protected Member Functions</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Abstract class used for signature generation. </p>
 
-<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00021">21</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
+<p>Definition at line <a class="el" href="../../d7/dd4/request__signer_8h_source.html#l00022">22</a> of file <a class="el" href="../../d7/dd4/request__signer_8h_source.html">request_signer.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a1c77d503f9ffc3462c1bf45b4f35bf32"></a>
 <div class="memitem">
@@ -180,7 +180,7 @@ Protected Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 103206eefb..4a7c722706 100644
--- a/docs/df/d46/classshaka_1_1media_1_1Muxer.html
+++ b/docs/df/d46/classshaka_1_1media_1_1Muxer.html
@@ -126,10 +126,10 @@ void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../.
 <tr class="separator:adc96fbcd6a4d4ba9845f8d00974ace0f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a9204fe352d13cea8a367ae9c14e9639e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a9204fe352d13cea8a367ae9c14e9639e">Cancel</a> ()</td></tr>
 <tr class="separator:a9204fe352d13cea8a367ae9c14e9639e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a786fbb91d7ece58c68334f5cef16ae71"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">SetMuxerListener</a> (scoped_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
-<tr class="separator:a786fbb91d7ece58c68334f5cef16ae71"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a0a2dfb3924ce1307f98c339e6587369c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">SetProgressListener</a> (scoped_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
-<tr class="separator:a0a2dfb3924ce1307f98c339e6587369c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0e76dd0a5c07dd538221459365ae824a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">SetMuxerListener</a> (std::unique_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt; muxer_listener)</td></tr>
+<tr class="separator:a0e76dd0a5c07dd538221459365ae824a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a25a146d553c385aad70dbff6b3e87eec"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">SetProgressListener</a> (std::unique_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt; progress_listener)</td></tr>
+<tr class="separator:a25a146d553c385aad70dbff6b3e87eec"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a0a1451c6277554ad1956225a345f5d3d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0a1451c6277554ad1956225a345f5d3d"></a>
 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"><b>streams</b> () const </td></tr>
 <tr class="separator:a0a1451c6277554ad1956225a345f5d3d"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -191,7 +191,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MediaStream</b></td>
 </div><div class="memdoc">
 <p>Cancel a muxing 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="../../d9/db9/muxer_8cc_source.html#l00082">82</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00084">84</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
 
 </div>
 </div>
@@ -281,18 +281,18 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MediaStream</b></td>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00029">29</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00031">31</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
 
 </div>
 </div>
-<a class="anchor" id="a786fbb91d7ece58c68334f5cef16ae71"></a>
+<a class="anchor" id="a0e76dd0a5c07dd538221459365ae824a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void shaka::media::Muxer::SetMuxerListener </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a> &gt;&#160;</td>
           <td class="paramname"><em>muxer_listener</em></td><td>)</td>
           <td></td>
         </tr>
@@ -306,18 +306,18 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MediaStream</b></td>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00086">86</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00088">88</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
 
 </div>
 </div>
-<a class="anchor" id="a0a2dfb3924ce1307f98c339e6587369c"></a>
+<a class="anchor" id="a25a146d553c385aad70dbff6b3e87eec"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void shaka::media::Muxer::SetProgressListener </td>
           <td>(</td>
-          <td class="paramtype">scoped_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt;&#160;</td>
+          <td class="paramtype">std::unique_ptr&lt; <a class="el" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a> &gt;&#160;</td>
           <td class="paramname"><em>progress_listener</em></td><td>)</td>
           <td></td>
         </tr>
@@ -331,7 +331,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>MediaStream</b></td>
   </dd>
 </dl>
 
-<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00090">90</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
+<p>Definition at line <a class="el" href="../../d9/db9/muxer_8cc_source.html#l00092">92</a> of file <a class="el" href="../../d9/db9/muxer_8cc_source.html">muxer.cc</a>.</p>
 
 </div>
 </div>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 23dc9ba3d9..ef1c11a8bd 100644
--- a/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html
+++ b/docs/df/d46/classshaka_1_1media_1_1ThreadedIoFile-members.html
@@ -113,14 +113,14 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html#a4a30faf9c8e8b367bcfebb7b642d73e7">Seek</a>(uint64_t position) override</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html#ac8c1f49d9e7ff55b1484129240c065f3">Size</a>() override</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html#a23949d75527c8de9f02e749c7744f11e">Tell</a>(uint64_t *position) override</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>ThreadedIoFile</b>(scoped_ptr&lt; File, FileCloser &gt; internal_file, Mode mode, uint64_t io_cache_size, uint64_t io_block_size) (defined in <a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a>)</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>ThreadedIoFile</b>(std::unique_ptr&lt; File, FileCloser &gt; internal_file, Mode mode, uint64_t io_cache_size, uint64_t io_block_size) (defined in <a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a>)</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html#aa14502dd48c1c64329283f5f1340f60f">Write</a>(const void *buffer, uint64_t length) override</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html#aeb5c0673c6d8120d636385a1ad3b3f71">~File</a>()</td><td class="entry"><a class="el" href="../../d3/d61/classshaka_1_1media_1_1File.html">shaka::media::File</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~ThreadedIoFile</b>() override (defined in <a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a>)</td><td class="entry"><a class="el" href="../../d0/d66/classshaka_1_1media_1_1ThreadedIoFile.html">shaka::media::ThreadedIoFile</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 8a2d3f8aca..4e9b2cb912 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 Fri Aug 19 2016 00:08:23 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:20 for DASH Media Packaging SDK by &#160;<a href="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 88338babe2..781948153e 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 2712e87c57..c89aa1dcea 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
@@ -98,7 +98,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>crypt_byte_block</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>data</b>() (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>earliest_presentation_time</b>() const  (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">EncryptingFragmenter</a>(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, scoped_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">EncryptingFragmenter</a>(scoped_refptr&lt; StreamInfo &gt; info, TrackFragment *traf, std::unique_ptr&lt; EncryptionKey &gt; encryption_key, int64_t clear_time, FourCC protection_scheme, uint8_t crypt_byte_block, uint8_t skip_byte_block, MuxerListener *listener)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>encryption_key</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>encryptor</b>() (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a0de01823838c543cb8f6f8e330712ac2">FinalizeFragment</a>() override</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a208b7b8dd83e73c4206469695a3216d4">OptimizeSampleEntries</a>(std::vector&lt; T &gt; *entries, T *default_value)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#ace1882cf57dab24ee8e38765675e69a1">PrepareFragmentForEncryption</a>(bool enable_encryption)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>protection_scheme</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_encryption_key</b>(scoped_ptr&lt; EncryptionKey &gt; encryption_key) (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_encryption_key</b>(std::unique_ptr&lt; EncryptionKey &gt; encryption_key) (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a6f9d467d7188160ee445b74b6f0905f4">set_use_decoding_timestamp_in_timeline</a>(bool use_decoding_timestamp_in_timeline)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>skip_byte_block</b>() const  (defined in <a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a>)</td><td class="entry"><a class="el" href="../../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html">shaka::media::mp4::EncryptingFragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>traf</b>() (defined in <a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a>)</td><td class="entry"><a class="el" href="../../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html">shaka::media::mp4::Fragmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 21d503f9bc..97a97dbd47 100644
--- a/docs/df/d60/classshaka_1_1MockMpdBuilder.html
+++ b/docs/df/d60/classshaka_1_1MockMpdBuilder.html
@@ -127,10 +127,10 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:af7eae5cc11141eed2b5451d969e57db6 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:adf8a48afbb29f1f1c54e4daaebb81337 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memItemLeft" align="right" valign="top">MpdType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#adf8a48afbb29f1f1c54e4daaebb81337">type</a> () const </td></tr>
 <tr class="separator:adf8a48afbb29f1f1c54e4daaebb81337 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a723afe73b9d619a1178ae21e46fd7450 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a723afe73b9d619a1178ae21e46fd7450"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">InjectClockForTesting</a> (scoped_ptr&lt; base::Clock &gt; clock)</td></tr>
-<tr class="memdesc:a723afe73b9d619a1178ae21e46fd7450 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="mdescLeft">&#160;</td><td class="mdescRight">This is for testing. <br/></td></tr>
-<tr class="separator:a723afe73b9d619a1178ae21e46fd7450 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7a4f96f12b589cfc4b5c2f44532eec53 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7a4f96f12b589cfc4b5c2f44532eec53"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a> (std::unique_ptr&lt; base::Clock &gt; clock)</td></tr>
+<tr class="memdesc:a7a4f96f12b589cfc4b5c2f44532eec53 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="mdescLeft">&#160;</td><td class="mdescRight">This is for testing. <br/></td></tr>
+<tr class="separator:a7a4f96f12b589cfc4b5c2f44532eec53 inherit pub_methods_classshaka_1_1MpdBuilder"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="inherited"></a>
 Additional Inherited Members</h2></td></tr>
@@ -153,7 +153,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f3761cf843..e0da19a879 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 52fcbb7f49..eaf8cee062 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 6ab68dab51..369c176742 100644
--- a/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html
+++ b/docs/df/d6a/classshaka_1_1MockMpdBuilder-members.html
@@ -95,7 +95,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <table class="directory">
   <tr class="even"><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ad32d4f20e6325b20267a2e905e1ec243">AddAdaptationSet</a>(const std::string &amp;lang)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#ab6fd968035d1cba5060fe23a107f8bdb">AddBaseUrl</a>(const std::string &amp;base_url)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">InjectClockForTesting</a>(scoped_ptr&lt; base::Clock &gt; clock)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">InjectClockForTesting</a>(std::unique_ptr&lt; base::Clock &gt; clock)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>kDynamic</b> enum value (defined in <a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a>)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>kStatic</b> enum value (defined in <a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a>)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html#a247a9c807274d4e707530f24e2d207f9">MakePathsRelativeToMpd</a>(const std::string &amp;mpd_path, MediaInfo *media_info)</td><td class="entry"><a class="el" href="../../dc/da1/classshaka_1_1MpdBuilder.html">shaka::MpdBuilder</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 4b01ab1154..a232e23459 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:21 for DASH Media Packaging SDK by &#160;<a href="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 054b9479b3..e49de7b31d 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 Fri Aug 19 2016 00:08:24 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 b96c1fff7d..6c6b679ee0 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 ffb7b07a70..75aad2d6c3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 fb2948757c..1f58a71590 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 cd597f6d9c..00d1288b8d 100644
--- a/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html
+++ b/docs/df/d87/classshaka_1_1media_1_1AesCryptor.html
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 4385ab588d..0ab503209b 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 f4c96eacdf..474f16a9a7 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 395fcdce69..d9389a79d3 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 695b81bb80..be92990429 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
@@ -103,12 +103,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
   <tr bgcolor="#f0f0f0"><td class="entry"><b>GetReferenceTimeScale</b>() const  (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc">Initialize</a>(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)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>moov</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MultiSegmentSegmenter</b>(const MuxerOptions &amp;options, scoped_ptr&lt; FileType &gt; ftyp, scoped_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">shaka::media::mp4::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">shaka::media::mp4::MultiSegmentSegmenter</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>MultiSegmentSegmenter</b>(const MuxerOptions &amp;options, std::unique_ptr&lt; FileType &gt; ftyp, std::unique_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">shaka::media::mp4::MultiSegmentSegmenter</a>)</td><td class="entry"><a class="el" href="../../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html">shaka::media::mp4::MultiSegmentSegmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>muxer_listener</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>options</b>() const  (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>progress_target</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#aeed8f5be9d9d7266afd017e0e5692d8d">sample_duration</a>() const </td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, scoped_ptr&lt; FileType &gt; ftyp, scoped_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>Segmenter</b>(const MuxerOptions &amp;options, std::unique_ptr&lt; FileType &gt; ftyp, std::unique_ptr&lt; Movie &gt; moov) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>set_progress_target</b>(uint64_t progress_target) (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
   <tr><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068">SetComplete</a>()</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>sidx</b>() (defined in <a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a>)</td><td class="entry"><a class="el" href="../../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html">shaka::media::mp4::Segmenter</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span></td></tr>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 202414a8ff..938cc0c702 100644
--- a/docs/df/d8d/es__parser__h26x_8h_source.html
+++ b/docs/df/d8d/es__parser__h26x_8h_source.html
@@ -98,10 +98,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="preprocessor">#include &lt;deque&gt;</span></div>
 <div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &lt;list&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/callback.h&quot;</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.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/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="preprocessor">#include &lt;memory&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/base/callback.h&quot;</span></div>
+<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;packager/base/compiler_specific.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;<span class="preprocessor">#include &quot;packager/media/formats/mp2t/es_parser.h&quot;</span></div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
@@ -117,7 +117,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">   28</a></span>&#160;<span class="keyword">class </span><a class="code" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">EsParserH26x</a> : <span class="keyword">public</span> <a class="code" href="../../da/d10/classshaka_1_1media_1_1mp2t_1_1EsParser.html">EsParser</a> {</div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160; <span class="keyword">public</span>:</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  <a class="code" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">EsParserH26x</a>(Nalu::CodecType type,</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;               scoped_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter,</div>
+<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;               std::unique_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter,</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;               uint32_t pid,</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;               <span class="keyword">const</span> EmitSampleCB&amp; emit_sample_cb);</div>
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  ~<a class="code" href="../../da/d23/classshaka_1_1media_1_1mp2t_1_1EsParserH26x.html">EsParserH26x</a>() <span class="keyword">override</span>;</div>
@@ -188,7 +188,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;  Nalu::CodecType type_;</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">// Bytes of the ES stream that have not been emitted yet.</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  scoped_ptr&lt;media::OffsetByteQueue&gt; es_queue_;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;  std::unique_ptr&lt;media::OffsetByteQueue&gt; es_queue_;</div>
 <div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;  std::list&lt;std::pair&lt;int64_t, TimingDesc&gt;&gt; timing_desc_list_;</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">// Parser state.</span></div>
@@ -200,7 +200,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;  std::deque&lt;NaluInfo&gt; access_unit_nalus_;</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">// Filter to convert H.264/H.265 Annex B byte stream to unit stream.</span></div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  scoped_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter_;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;  std::unique_ptr&lt;H26xByteToUnitStreamConverter&gt; stream_converter_;</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">// Frame for which we do not yet have a duration.</span></div>
 <div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;  scoped_refptr&lt;MediaSample&gt; pending_sample_;</div>
@@ -222,7 +222,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 49c2f65dc8..1ff6554f32 100644
--- a/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html
+++ b/docs/df/d94/classshaka_1_1RepresentationStateChangeListener.html
@@ -195,7 +195,7 @@ Public Member Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 c4c93bd6a0..a0d17e0205 100644
--- a/docs/df/d96/xml__node_8cc_source.html
+++ b/docs/df/d96/xml__node_8cc_source.html
@@ -101,8 +101,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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/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/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/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>
@@ -226,7 +226,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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> node_.Pass();</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>
@@ -467,10 +467,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <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="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#l00096">xml_node.h:96</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="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#l00031">xml_node.h:31</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>
@@ -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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 15b3fe2d57..88cd79a6a2 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9c677b5caa..2ce3ad5ae0 100644
--- a/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html
+++ b/docs/df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html
@@ -159,7 +159,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>RepresentationType in MPD. </p>
 
-<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00128">128</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
+<p>Definition at line <a class="el" href="../../dd/de7/xml__node_8h_source.html#l00129">129</a> of file <a class="el" href="../../dd/de7/xml__node_8h_source.html">xml_node.h</a>.</p>
 </div><h2 class="groupheader">Member Function Documentation</h2>
 <a class="anchor" id="a49050cf0e7883bfa6e8e2fb0174b2a7a"></a>
 <div class="memitem">
@@ -311,7 +311,7 @@ Additional Inherited Members</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 9c862b3f1a..c6975d768b 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 9489bca063..9e2ac90642 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 Fri Aug 19 2016 00:08:25 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:22 for DASH Media Packaging SDK by &#160;<a href="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 d2c2d21352..59fdb1b827 100644
--- a/docs/df/dad/decrypt__config_8h_source.html
+++ b/docs/df/dad/decrypt__config_8h_source.html
@@ -99,7 +99,7 @@ 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;string&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/base/memory/scoped_ptr.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/media/base/fourccs.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>
@@ -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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 c274a8a082..eaaec8147f 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 a6e84a6a5a..ede0377eeb 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 a69cdd2186..c47a52be07 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 f50e37f193..ce27060455 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 Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9494d296c6..e94c8b5fdf 100644
--- a/docs/df/ddc/webm_2segmenter_8h_source.html
+++ b/docs/df/ddc/webm_2segmenter_8h_source.html
@@ -96,8 +96,8 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#ifndef MEDIA_FORMATS_WEBM_SEGMENTER_H_</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIA_FORMATS_WEBM_SEGMENTER_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 &quot;packager/base/memory/ref_counted.h&quot;</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/scoped_ptr.h&quot;</span></div>
+<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div>
+<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="preprocessor">#include &quot;packager/base/memory/ref_counted.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/status.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/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/formats/webm/mkv_writer.h&quot;</span></div>
@@ -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">explicit</span> <a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a>(<span class="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options);</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;  <span class="keyword">virtual</span> ~<a class="code" href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">Segmenter</a>();</div>
 <div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</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#a144b19be7c3f693b06da2fbe2e40587a">Initialize</a>(scoped_ptr&lt;MkvWriter&gt; writer,</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</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">Initialize</a>(std::unique_ptr&lt;MkvWriter&gt; writer,</div>
 <div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;                    <a class="code" href="../../d5/db1/classshaka_1_1media_1_1StreamInfo.html">StreamInfo</a>* info,</div>
 <div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;                    <a class="code" href="../../d4/de6/classshaka_1_1media_1_1ProgressListener.html">ProgressListener</a>* progress_listener,</div>
 <div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;                    <a class="code" href="../../dd/d7a/classshaka_1_1media_1_1MuxerListener.html">MuxerListener</a>* muxer_listener,</div>
@@ -165,7 +165,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;  uint64_t segment_payload_pos()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> segment_payload_pos_; }</div>
 <div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;  <span class="keywordtype">double</span> cluster_length_sec()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> cluster_length_sec_; }</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">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(scoped_ptr&lt;MkvWriter&gt; writer) = 0;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoInitialize(std::unique_ptr&lt;MkvWriter&gt; writer) = 0;</div>
 <div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;  <span class="keyword">virtual</span> <a class="code" href="../../d0/d93/classshaka_1_1media_1_1Status.html">Status</a> DoFinalize() = 0;</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">private</span>:</div>
@@ -192,10 +192,10 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;  uint64_t reference_frame_timestamp_;</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="keyword">const</span> <a class="code" href="../../d0/d27/structshaka_1_1media_1_1MuxerOptions.html">MuxerOptions</a>&amp; options_;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  scoped_ptr&lt;Encryptor&gt; encryptor_;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;  std::unique_ptr&lt;Encryptor&gt; encryptor_;</div>
 <div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;  <span class="keywordtype">double</span> clear_lead_;</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;  scoped_ptr&lt;mkvmuxer::Cluster&gt; cluster_;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;  std::unique_ptr&lt;mkvmuxer::Cluster&gt; cluster_;</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;  mkvmuxer::Cues cues_;</div>
 <div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;  <a class="code" href="../../dc/d16/classshaka_1_1media_1_1SeekHead.html">SeekHead</a> seek_head_;</div>
 <div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;  mkvmuxer::SegmentInfo segment_info_;</div>
@@ -234,12 +234,12 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_a6060ddc97c58e4435d1db932de17e131"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a6060ddc97c58e4435d1db932de17e131">shaka::media::webm::Segmenter::SetCluster</a></div><div class="ttdeci">Status SetCluster(uint64_t start_webm_timecode, uint64_t position, MkvWriter *writer)</div><div class="ttdoc">Creates a Cluster object with the given parameters. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00246">segmenter.cc:246</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_1webm_1_1Segmenter_html_a3a6c1932e6c4894a61eb7230022bceb5"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a3a6c1932e6c4894a61eb7230022bceb5">shaka::media::webm::Segmenter::GetIndexRangeStartAndEnd</a></div><div class="ttdeci">virtual bool GetIndexRangeStartAndEnd(uint64_t *start, uint64_t *end)=0</div></div>
-<div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_a144b19be7c3f693b06da2fbe2e40587a"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">shaka::media::webm::Segmenter::Initialize</a></div><div class="ttdeci">Status Initialize(scoped_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#l00049">segmenter.cc:49</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1MkvWriter_html"><div class="ttname"><a href="../../d1/d0a/classshaka_1_1media_1_1MkvWriter.html">shaka::media::MkvWriter</a></div><div class="ttdoc">An implementation of IMkvWriter using our File type. </div><div class="ttdef"><b>Definition:</b> <a href="../../d2/dd6/mkv__writer_8h_source.html#l00021">mkv_writer.h:21</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#l00049">segmenter.cc:49</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html">shaka::media::webm::Segmenter</a></div><div class="ttdef"><b>Definition:</b> <a href="../../df/ddc/webm_2segmenter_8h_source.html#l00034">segmenter.h:34</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_1webm_1_1Segmenter_html_aa84782877f1afaf9519a552ac3d5d417"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa84782877f1afaf9519a552ac3d5d417">shaka::media::webm::Segmenter::Finalize</a></div><div class="ttdeci">Status Finalize()</div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00107">segmenter.cc:107</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#l00031">key_source.h:31</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_1webm_1_1Segmenter_html_a32dc8b7461252b99fe52384b04e3bca2"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a32dc8b7461252b99fe52384b04e3bca2">shaka::media::webm::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="../../dc/d53/webm_2segmenter_8cc_source.html#l00255">segmenter.cc:255</a></div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_a611b919c82885b6bcfe39a1def78548c"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a611b919c82885b6bcfe39a1def78548c">shaka::media::webm::Segmenter::GetInitRangeStartAndEnd</a></div><div class="ttdeci">virtual bool GetInitRangeStartAndEnd(uint64_t *start, uint64_t *end)=0</div></div>
 <div class="ttc" id="classshaka_1_1media_1_1webm_1_1Segmenter_html_a8de27c5b6480f968cbef9eafec3731d7"><div class="ttname"><a href="../../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a8de27c5b6480f968cbef9eafec3731d7">shaka::media::webm::Segmenter::FromWebMTimecode</a></div><div class="ttdeci">uint64_t FromWebMTimecode(uint64_t time_webm_timecode)</div><div class="ttdoc">Converts the given time in WebM timecode to ISO BMFF timescale. </div><div class="ttdef"><b>Definition:</b> <a href="../../dc/d53/webm_2segmenter_8cc_source.html#l00202">segmenter.cc:202</a></div></div>
@@ -250,7 +250,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 43f1140db7..3f1ae91060 100644
--- a/docs/df/dde/ts__section__psi_8cc_source.html
+++ b/docs/df/dde/ts__section__psi_8cc_source.html
@@ -228,7 +228,7 @@ var searchBox = new SearchBox("searchBox", "../../search",false,'Search');
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:17 for DASH Media Packaging SDK by &#160;<a href="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 8cff1a2f14..8c7b662615 100644
--- a/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html
+++ b/docs/df/de2/structshaka_1_1media_1_1H264SEIRecoveryPoint.html
@@ -118,7 +118,7 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>changing_slice_group_i
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:22 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:19 for DASH Media Packaging SDK by &#160;<a href="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 9049fa8b10..461616b930 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 Fri Aug 19 2016 00:08:20 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:16 for DASH Media Packaging SDK by &#160;<a href="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 444d108be6..3365475ab9 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 229eb61913..97a102945d 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 Fri Aug 19 2016 00:08:21 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:18 for DASH Media Packaging SDK by &#160;<a href="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 3954967458..844d60f38a 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 e97b8ed90b..5ca2e9b628 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 879347a8c2..063546652d 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3e8a651501..c7d666c655 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0a10e82cd1..2219a31ae2 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f047e46c2e..40a889338c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 fbbeaad79f..b3bc4aa626 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f93d874f6a..967adc5ab3 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 b11b13489f..13c4fae523 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f173a64504..5b99db858c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 fe39a03a24..fec13d18ef 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 00b9f3eecd..1e665c96a8 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 c5e2b42636..ad91be8812 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 057512e2cd..aee738eb21 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 b9860e7632..6abe6c77ae 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 9d781c6154..4f6c7cd1e1 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 bd52a8a881..ef6c3006f1 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 84c2c764a8..f9a394d689 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:24 for DASH Media Packaging SDK by &#160;<a href="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 1fb391c10d..f3cfef38e4 100644
--- a/docs/functions.html
+++ b/docs/functions.html
@@ -157,7 +157,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation</a>
 </li>
 <li>AddPesPacket()
-: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">shaka::media::mp2t::TsWriter</a>
+: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">shaka::media::mp2t::TsWriter</a>
 </li>
 <li>AddRepresentation()
 : <a class="el" href="d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet</a>
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58">shaka::media::AesEncryptor</a>
 </li>
 <li>AesPatternCryptor()
-: <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">shaka::media::AesPatternCryptor</a>
+: <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">shaka::media::AesPatternCryptor</a>
 </li>
 <li>AppendInt()
 : <a class="el" href="dc/d41/classshaka_1_1media_1_1BufferWriter.html#abd8854feedd8b45146eb04dacf7d5b2f">shaka::media::BufferWriter</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3ae001cde5..d53efdc055 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 933fb3e20c..aeae2579ac 100644
--- a/docs/functions_c.html
+++ b/docs/functions_c.html
@@ -201,7 +201,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey</a>
 </li>
 <li>CreateAndInitializeSegmenter()
-: <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">shaka::media::SegmentTestBase</a>
+: <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">shaka::media::SegmentTestBase</a>
 </li>
 <li>CreateBox()
 : <a class="el" href="d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#af9b917cb91b6c10ee7a6f5b41fc7e0d9">shaka::media::ProtectionSystemSpecificInfo</a>
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">shaka::media::MediaSample</a>
 </li>
 <li>CreateFromHexStrings()
-: <a class="el" href="d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">shaka::media::FixedKeySource</a>
+: <a class="el" href="d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">shaka::media::FixedKeySource</a>
 </li>
 <li>CreateMuxerOptions()
 : <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">shaka::media::SegmentTestBase</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 bd9dbf2c91..cd29c00702 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 33b3cb2fe5..9ec925fd95 100644
--- a/docs/functions_e.html
+++ b/docs/functions_e.html
@@ -140,13 +140,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c">shaka::media::webm::Encryptor</a>
 </li>
 <li>EncryptingFragmenter()
-: <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">shaka::media::mp4::EncryptingFragmenter</a>
+: <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">shaka::media::mp4::EncryptingFragmenter</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 94dad96cac..75af0ed06d 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:24 for DASH Media Packaging SDK by &#160;<a href="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 40b8dda70f..003d7d8b7b 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:24 for DASH Media Packaging SDK by &#160;<a href="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 ae6331194b..05618b2980 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 bb58531fde..bfdd5b07c2 100644
--- a/docs/functions_func.html
+++ b/docs/functions_func.html
@@ -157,7 +157,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932">shaka::Representation</a>
 </li>
 <li>AddPesPacket()
-: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61">shaka::media::mp2t::TsWriter</a>
+: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3">shaka::media::mp2t::TsWriter</a>
 </li>
 <li>AddRepresentation()
 : <a class="el" href="d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3">shaka::AdaptationSet</a>
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58">shaka::media::AesEncryptor</a>
 </li>
 <li>AesPatternCryptor()
-: <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107">shaka::media::AesPatternCryptor</a>
+: <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5">shaka::media::AesPatternCryptor</a>
 </li>
 <li>AppendInt()
 : <a class="el" href="dc/d41/classshaka_1_1media_1_1BufferWriter.html#abd8854feedd8b45146eb04dacf7d5b2f">shaka::media::BufferWriter</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 21e816cc46..cf611528cc 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 470d398e4a..04031c67fa 100644
--- a/docs/functions_func_c.html
+++ b/docs/functions_func_c.html
@@ -201,7 +201,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881">shaka::media::RsaPublicKey</a>
 </li>
 <li>CreateAndInitializeSegmenter()
-: <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d">shaka::media::SegmentTestBase</a>
+: <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64">shaka::media::SegmentTestBase</a>
 </li>
 <li>CreateBox()
 : <a class="el" href="d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#af9b917cb91b6c10ee7a6f5b41fc7e0d9">shaka::media::ProtectionSystemSpecificInfo</a>
@@ -216,7 +216,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788">shaka::media::MediaSample</a>
 </li>
 <li>CreateFromHexStrings()
-: <a class="el" href="d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99">shaka::media::FixedKeySource</a>
+: <a class="el" href="d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a">shaka::media::FixedKeySource</a>
 </li>
 <li>CreateMuxerOptions()
 : <a class="el" href="d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e">shaka::media::SegmentTestBase</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 5c1c0bd425..2db5648051 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0211eb6ef8..f2843b0ac5 100644
--- a/docs/functions_func_e.html
+++ b/docs/functions_func_e.html
@@ -140,13 +140,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c">shaka::media::webm::Encryptor</a>
 </li>
 <li>EncryptingFragmenter()
-: <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4">shaka::media::mp4::EncryptingFragmenter</a>
+: <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5">shaka::media::mp4::EncryptingFragmenter</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 bb6f20a7ca..ae04904b3c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 71fc72c49a..66d8b8eaaf 100644
--- a/docs/functions_func_g.html
+++ b/docs/functions_func_g.html
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html#a57f8a71d948f27303ba41dd5aafb5445">shaka::media::H26xByteToUnitStreamConverter</a>
 </li>
 <li>GetDecryptConfig()
-: <a class="el" href="de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">shaka::media::mp4::TrackRunIterator</a>
+: <a class="el" href="de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">shaka::media::mp4::TrackRunIterator</a>
 </li>
 <li>GetDuration()
 : <a class="el" href="d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter</a>
@@ -215,7 +215,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html#a63950483c11df9c44e3cb8d559f629d9">shaka::media::mp2t::ContinuityCounter</a>
 </li>
 <li>GetNextPesPacket()
-: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">shaka::media::mp2t::PesPacketGenerator</a>
+: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">shaka::media::mp2t::PesPacketGenerator</a>
 </li>
 <li>GetNumChannels()
 : <a class="el" href="d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a2bacb4e7337248bca9e678268e3db491">shaka::media::AACAudioSpecificConfig</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 6195b10aab..7a81f5f0d4 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 e048da22f4..c251749693 100644
--- a/docs/functions_func_i.html
+++ b/docs/functions_func_i.html
@@ -152,7 +152,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d">shaka::media::NalUnitToByteStreamConverter</a>
 , <a class="el" href="dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d">shaka::media::VideoSliceHeaderParser</a>
 , <a class="el" href="de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f">shaka::media::webm::Encryptor</a>
-, <a class="el" href="dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">shaka::media::webm::Segmenter</a>
+, <a class="el" href="dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">shaka::media::webm::Segmenter</a>
 </li>
 <li>InitializeFragment()
 : <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter</a>
@@ -165,13 +165,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">shaka::media::AesPatternCryptor</a>
 </li>
 <li>InjectClockForTesting()
-: <a class="el" href="dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">shaka::MpdBuilder</a>
+: <a class="el" href="dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">shaka::MpdBuilder</a>
 </li>
 <li>InjectPesPacketGeneratorForTesting()
-: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">shaka::media::mp2t::TsSegmenter</a>
+: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">shaka::media::mp2t::TsSegmenter</a>
 </li>
 <li>InjectTsWriterForTesting()
-: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">shaka::media::mp2t::TsSegmenter</a>
+: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">shaka::media::mp2t::TsSegmenter</a>
 </li>
 <li>IsAAC()
 : <a class="el" href="d5/d13/classshaka_1_1media_1_1ESDescriptor.html#a47592ec424dc9dd2beb5cc0f505e6681">shaka::media::ESDescriptor</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 b22b554631..9388c89db0 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 00242bf64a..0aa5b8c480 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3d38817252..367b3a2aec 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 84c6d10246..a08c558153 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 f9adab1b25..a17452bc33 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 6112849d0c..527109c74c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 67098c40d3..186af7d9a3 100644
--- a/docs/functions_func_r.html
+++ b/docs/functions_func_r.html
@@ -183,7 +183,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="dd/d7c/classshaka_1_1media_1_1IoCache.html#ae751faea047196ba2770f5bf90649185">shaka::media::IoCache</a>
 </li>
 <li>Representation()
-: <a class="el" href="de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">shaka::Representation</a>
+: <a class="el" href="de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation</a>
 </li>
 <li>Reset()
 : <a class="el" href="d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">shaka::media::ByteQueue</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 fa1e3cb822..4e227689fe 100644
--- a/docs/functions_func_s.html
+++ b/docs/functions_func_s.html
@@ -160,7 +160,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a9917d625989f0eaac93fec12fec8dca0">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>set_key_fetcher()
-: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">shaka::media::WidevineKeySource</a>
+: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource</a>
 </li>
 <li>set_nalu_length_size()
 : <a class="el" href="de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#ab0c889c2382b6f41ad1993c136b03d07">shaka::media::DecoderConfigurationRecord</a>
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a02ffa1c0ad370f047e6f09b6bbc8b3b8">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>set_signer()
-: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">shaka::media::WidevineKeySource</a>
+: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource</a>
 </li>
 <li>set_stream_id()
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#ad4be259c146b57f61f41638970839fc4">shaka::media::mp2t::PesPacket</a>
@@ -187,7 +187,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode</a>
 </li>
 <li>SetEncryptionKey()
-: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">shaka::media::mp2t::PesPacketGenerator</a>
+: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">shaka::media::mp2t::PesPacketGenerator</a>
 </li>
 <li>SetError()
 : <a class="el" href="d0/d93/classshaka_1_1media_1_1Status.html#a26903fbb0ee18f6b8d7cd441e922b644">shaka::media::Status</a>
@@ -208,17 +208,17 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor</a>
 </li>
 <li>SetKeySource()
-: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">shaka::media::Demuxer</a>
+: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer</a>
 , <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer</a>
 </li>
 <li>SetMuxerListener()
-: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">shaka::media::Muxer</a>
+: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">shaka::media::Muxer</a>
 </li>
 <li>SetProgramMapTableWriterForTesting()
-: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">shaka::media::mp2t::TsWriter</a>
+: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">shaka::media::mp2t::TsWriter</a>
 </li>
 <li>SetProgressListener()
-: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">shaka::media::Muxer</a>
+: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">shaka::media::Muxer</a>
 </li>
 <li>SetSampleDuration()
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 80da99cd83..c8750f9219 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 4a552ba4d6..f1eeb8753d 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 192283f436..3dbae73450 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 06083df1a7..362a57fe72 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 2bca485965..fac43918f7 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ffab3b8b56..3c94b3950c 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 56e1b9d572..66d6766ad6 100644
--- a/docs/functions_g.html
+++ b/docs/functions_g.html
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html#a57f8a71d948f27303ba41dd5aafb5445">shaka::media::H26xByteToUnitStreamConverter</a>
 </li>
 <li>GetDecryptConfig()
-: <a class="el" href="de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524">shaka::media::mp4::TrackRunIterator</a>
+: <a class="el" href="de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa">shaka::media::mp4::TrackRunIterator</a>
 </li>
 <li>GetDuration()
 : <a class="el" href="d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2">shaka::media::mp4::Segmenter</a>
@@ -215,7 +215,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html#a63950483c11df9c44e3cb8d559f629d9">shaka::media::mp2t::ContinuityCounter</a>
 </li>
 <li>GetNextPesPacket()
-: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b">shaka::media::mp2t::PesPacketGenerator</a>
+: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650">shaka::media::mp2t::PesPacketGenerator</a>
 </li>
 <li>GetNumChannels()
 : <a class="el" href="d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a2bacb4e7337248bca9e678268e3db491">shaka::media::AACAudioSpecificConfig</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 ab7a708982..5669743a16 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 9818ebe692..35acfcc1c8 100644
--- a/docs/functions_i.html
+++ b/docs/functions_i.html
@@ -155,7 +155,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d">shaka::media::NalUnitToByteStreamConverter</a>
 , <a class="el" href="dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d">shaka::media::VideoSliceHeaderParser</a>
 , <a class="el" href="de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f">shaka::media::webm::Encryptor</a>
-, <a class="el" href="dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a">shaka::media::webm::Segmenter</a>
+, <a class="el" href="dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb">shaka::media::webm::Segmenter</a>
 </li>
 <li>InitializeFragment()
 : <a class="el" href="dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3">shaka::media::mp4::EncryptingFragmenter</a>
@@ -168,13 +168,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 , <a class="el" href="d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34">shaka::media::AesPatternCryptor</a>
 </li>
 <li>InjectClockForTesting()
-: <a class="el" href="dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450">shaka::MpdBuilder</a>
+: <a class="el" href="dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53">shaka::MpdBuilder</a>
 </li>
 <li>InjectPesPacketGeneratorForTesting()
-: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25">shaka::media::mp2t::TsSegmenter</a>
+: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c">shaka::media::mp2t::TsSegmenter</a>
 </li>
 <li>InjectTsWriterForTesting()
-: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d">shaka::media::mp2t::TsSegmenter</a>
+: <a class="el" href="de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9">shaka::media::mp2t::TsSegmenter</a>
 </li>
 <li>IsAAC()
 : <a class="el" href="d5/d13/classshaka_1_1media_1_1ESDescriptor.html#a47592ec424dc9dd2beb5cc0f505e6681">shaka::media::ESDescriptor</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 00281db104..cf31ec7182 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 6c8d0945d8..071f6da683 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 385c8c2894..5b3607e7f6 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 2bf6784658..2b992bb620 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 c4231dfd01..5df0170625 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8bc7f3f6ba..9778b39703 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8ce25c34f7..a462c86a70 100644
--- a/docs/functions_r.html
+++ b/docs/functions_r.html
@@ -183,7 +183,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="dd/d7c/classshaka_1_1media_1_1IoCache.html#ae751faea047196ba2770f5bf90649185">shaka::media::IoCache</a>
 </li>
 <li>Representation()
-: <a class="el" href="de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0">shaka::Representation</a>
+: <a class="el" href="de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb">shaka::Representation</a>
 </li>
 <li>Reset()
 : <a class="el" href="d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84">shaka::media::ByteQueue</a>
@@ -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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8f91aeb623..c31d37a929 100644
--- a/docs/functions_s.html
+++ b/docs/functions_s.html
@@ -172,7 +172,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a9917d625989f0eaac93fec12fec8dca0">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>set_key_fetcher()
-: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd">shaka::media::WidevineKeySource</a>
+: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04">shaka::media::WidevineKeySource</a>
 </li>
 <li>set_nalu_length_size()
 : <a class="el" href="de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#ab0c889c2382b6f41ad1993c136b03d07">shaka::media::DecoderConfigurationRecord</a>
@@ -181,7 +181,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a02ffa1c0ad370f047e6f09b6bbc8b3b8">shaka::media::mp2t::PesPacket</a>
 </li>
 <li>set_signer()
-: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272">shaka::media::WidevineKeySource</a>
+: <a class="el" href="da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526">shaka::media::WidevineKeySource</a>
 </li>
 <li>set_stream_id()
 : <a class="el" href="d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#ad4be259c146b57f61f41638970839fc4">shaka::media::mp2t::PesPacket</a>
@@ -199,7 +199,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c">shaka::xml::XmlNode</a>
 </li>
 <li>SetEncryptionKey()
-: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916">shaka::media::mp2t::PesPacketGenerator</a>
+: <a class="el" href="d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a">shaka::media::mp2t::PesPacketGenerator</a>
 </li>
 <li>SetError()
 : <a class="el" href="d0/d93/classshaka_1_1media_1_1Status.html#a26903fbb0ee18f6b8d7cd441e922b644">shaka::media::Status</a>
@@ -220,17 +220,17 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 : <a class="el" href="df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea">shaka::media::AesCryptor</a>
 </li>
 <li>SetKeySource()
-: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a">shaka::media::Demuxer</a>
+: <a class="el" href="dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e">shaka::media::Demuxer</a>
 , <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b">shaka::media::Muxer</a>
 </li>
 <li>SetMuxerListener()
-: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71">shaka::media::Muxer</a>
+: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a">shaka::media::Muxer</a>
 </li>
 <li>SetProgramMapTableWriterForTesting()
-: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971">shaka::media::mp2t::TsWriter</a>
+: <a class="el" href="de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0">shaka::media::mp2t::TsWriter</a>
 </li>
 <li>SetProgressListener()
-: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c">shaka::media::Muxer</a>
+: <a class="el" href="df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec">shaka::media::Muxer</a>
 </li>
 <li>SetSampleDuration()
 : <a class="el" href="de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98">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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3649864d1b..9e6f9087de 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 9288f94621..9207d3b187 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:24 for DASH Media Packaging SDK by &#160;<a href="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 a0c1a97f40..391a19a410 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 df68ae250a..7920c3b356 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 0836945dd2..dccd416be3 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:24 for DASH Media Packaging SDK by &#160;<a href="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 262f209384..e57a514d3f 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 2547e4d8ad..19d80fdc31 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 1df7f0437e..00f38c803e 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 8c58889105..1761ade00b 100644
--- a/docs/hierarchy.html
+++ b/docs/hierarchy.html
@@ -368,7 +368,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 3d77d98f18..4fae1a1443 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 eff2650383..e3663702b4 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 b6e3a5e22a..a92e25fe20 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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 1dde94701f..908d21d4fb 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 Fri Aug 19 2016 00:08:26 for DASH Media Packaging SDK by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Aug 19 2016 00:58:23 for DASH Media Packaging SDK by &#160;<a href="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_0.js b/docs/search/all_0.js
index 5e5990c7a3..fcbe6dfd1e 100644
--- a/docs/search/all_0.js
+++ b/docs/search/all_0.js
@@ -16,7 +16,7 @@ var searchData=
   ['addliveonlyinfo',['AddLiveOnlyInfo',['../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60',1,'shaka::xml::RepresentationXmlNode']]],
   ['addnalu',['AddNalu',['../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#a6b2234ce5bdffaaaad217414df314598',1,'shaka::media::DecoderConfigurationRecord']]],
   ['addnewsegment',['AddNewSegment',['../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932',1,'shaka::Representation']]],
-  ['addpespacket',['AddPesPacket',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61',1,'shaka::media::mp2t::TsWriter']]],
+  ['addpespacket',['AddPesPacket',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3',1,'shaka::media::mp2t::TsWriter']]],
   ['addrepresentation',['AddRepresentation',['../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3',1,'shaka::AdaptationSet']]],
   ['addrole',['AddRole',['../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730',1,'shaka::AdaptationSet']]],
   ['addroleelement',['AddRoleElement',['../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1',1,'shaka::xml::AdaptationSetXmlNode']]],
@@ -39,7 +39,7 @@ var searchData=
   ['aesctrencryptor',['AesCtrEncryptor',['../d0/dd8/classshaka_1_1media_1_1AesCtrEncryptor.html',1,'shaka::media']]],
   ['aesencryptor',['AesEncryptor',['../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58',1,'shaka::media::AesEncryptor']]],
   ['aesencryptor',['AesEncryptor',['../d3/d75/classshaka_1_1media_1_1AesEncryptor.html',1,'shaka::media']]],
-  ['aespatterncryptor',['AesPatternCryptor',['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107',1,'shaka::media::AesPatternCryptor']]],
+  ['aespatterncryptor',['AesPatternCryptor',['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5',1,'shaka::media::AesPatternCryptor']]],
   ['aespatterncryptor',['AesPatternCryptor',['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html',1,'shaka::media']]],
   ['aesrequestsigner',['AesRequestSigner',['../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html',1,'shaka::media']]],
   ['appendint',['AppendInt',['../dc/d41/classshaka_1_1media_1_1BufferWriter.html#abd8854feedd8b45146eb04dacf7d5b2f',1,'shaka::media::BufferWriter']]],
diff --git a/docs/search/all_10.js b/docs/search/all_10.js
index 6c77573f68..7dda612aaf 100644
--- a/docs/search/all_10.js
+++ b/docs/search/all_10.js
@@ -36,26 +36,26 @@ var searchData=
   ['segmenttype',['SegmentType',['../d3/dd0/structshaka_1_1media_1_1mp4_1_1SegmentType.html',1,'shaka::media::mp4']]],
   ['set_5fclock',['set_clock',['../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68',1,'shaka::media::Muxer']]],
   ['set_5fdts',['set_dts',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a9917d625989f0eaac93fec12fec8dca0',1,'shaka::media::mp2t::PesPacket']]],
-  ['set_5fkey_5ffetcher',['set_key_fetcher',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd',1,'shaka::media::WidevineKeySource']]],
+  ['set_5fkey_5ffetcher',['set_key_fetcher',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04',1,'shaka::media::WidevineKeySource']]],
   ['set_5fnalu_5flength_5fsize',['set_nalu_length_size',['../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#ab0c889c2382b6f41ad1993c136b03d07',1,'shaka::media::DecoderConfigurationRecord']]],
   ['set_5fpts',['set_pts',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a02ffa1c0ad370f047e6f09b6bbc8b3b8',1,'shaka::media::mp2t::PesPacket']]],
-  ['set_5fsigner',['set_signer',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272',1,'shaka::media::WidevineKeySource']]],
+  ['set_5fsigner',['set_signer',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526',1,'shaka::media::WidevineKeySource']]],
   ['set_5fstream_5fid',['set_stream_id',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#ad4be259c146b57f61f41638970839fc4',1,'shaka::media::mp2t::PesPacket']]],
   ['set_5fuse_5fdecoding_5ftimestamp_5fin_5ftimeline',['set_use_decoding_timestamp_in_timeline',['../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a6f9d467d7188160ee445b74b6f0905f4',1,'shaka::media::mp4::Fragmenter']]],
   ['setcluster',['SetCluster',['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a6060ddc97c58e4435d1db932de17e131',1,'shaka::media::webm::Segmenter']]],
   ['setcomplete',['SetComplete',['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068',1,'shaka::media::mp4::Segmenter']]],
   ['setcontent',['SetContent',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c',1,'shaka::xml::XmlNode']]],
-  ['setencryptionkey',['SetEncryptionKey',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916',1,'shaka::media::mp2t::PesPacketGenerator']]],
+  ['setencryptionkey',['SetEncryptionKey',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a',1,'shaka::media::mp2t::PesPacketGenerator']]],
   ['seterror',['SetError',['../d0/d93/classshaka_1_1media_1_1Status.html#a26903fbb0ee18f6b8d7cd441e922b644',1,'shaka::media::Status']]],
   ['setfloatingpointattribute',['SetFloatingPointAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba',1,'shaka::xml::XmlNode']]],
   ['setgroup',['SetGroup',['../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af',1,'shaka::AdaptationSet']]],
   ['setid',['SetId',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f',1,'shaka::xml::XmlNode']]],
   ['setintegerattribute',['SetIntegerAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20',1,'shaka::xml::XmlNode']]],
   ['setiv',['SetIv',['../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea',1,'shaka::media::AesCryptor']]],
-  ['setkeysource',['SetKeySource',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a',1,'shaka::media::Demuxer::SetKeySource()'],['../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b',1,'shaka::media::Muxer::SetKeySource()']]],
-  ['setmuxerlistener',['SetMuxerListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71',1,'shaka::media::Muxer']]],
-  ['setprogrammaptablewriterfortesting',['SetProgramMapTableWriterForTesting',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971',1,'shaka::media::mp2t::TsWriter']]],
-  ['setprogresslistener',['SetProgressListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c',1,'shaka::media::Muxer']]],
+  ['setkeysource',['SetKeySource',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e',1,'shaka::media::Demuxer::SetKeySource()'],['../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b',1,'shaka::media::Muxer::SetKeySource()']]],
+  ['setmuxerlistener',['SetMuxerListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a',1,'shaka::media::Muxer']]],
+  ['setprogrammaptablewriterfortesting',['SetProgramMapTableWriterForTesting',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0',1,'shaka::media::mp2t::TsWriter']]],
+  ['setprogresslistener',['SetProgressListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec',1,'shaka::media::Muxer']]],
   ['setsampleduration',['SetSampleDuration',['../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98',1,'shaka::Representation']]],
   ['setstringattribute',['SetStringAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329',1,'shaka::xml::XmlNode']]],
   ['settswriterfileopenedfortesting',['SetTsWriterFileOpenedForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918',1,'shaka::media::mp2t::TsSegmenter']]],
diff --git a/docs/search/all_2.js b/docs/search/all_2.js
index f2d4826b0b..98c4c094eb 100644
--- a/docs/search/all_2.js
+++ b/docs/search/all_2.js
@@ -39,12 +39,12 @@ var searchData=
   ['copyfile',['CopyFile',['../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e',1,'shaka::media::File::CopyFile(File *source, File *destination)'],['../d3/d61/classshaka_1_1media_1_1File.html#a9f5ebcd3bdebb7fb02a7a7adf378b344',1,'shaka::media::File::CopyFile(File *source, File *destination, int64_t max_copy)']]],
   ['copyfrom',['CopyFrom',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b',1,'shaka::media::MediaSample::CopyFrom(const uint8_t *data, size_t size, bool is_key_frame)'],['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a99f83b1803101853aa03bda8f1251e8c',1,'shaka::media::MediaSample::CopyFrom(const uint8_t *data, size_t size, const uint8_t *side_data, size_t side_data_size, bool is_key_frame)']]],
   ['create',['Create',['../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8',1,'shaka::media::RsaPrivateKey::Create()'],['../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881',1,'shaka::media::RsaPublicKey::Create()']]],
-  ['createandinitializesegmenter',['CreateAndInitializeSegmenter',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d',1,'shaka::media::SegmentTestBase']]],
+  ['createandinitializesegmenter',['CreateAndInitializeSegmenter',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64',1,'shaka::media::SegmentTestBase']]],
   ['createbox',['CreateBox',['../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#af9b917cb91b6c10ee7a6f5b41fc7e0d9',1,'shaka::media::ProtectionSystemSpecificInfo']]],
   ['createemptymediasample',['CreateEmptyMediaSample',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d',1,'shaka::media::MediaSample']]],
   ['createencryptor',['CreateEncryptor',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e',1,'shaka::media::mp4::EncryptingFragmenter']]],
   ['createeosbuffer',['CreateEOSBuffer',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788',1,'shaka::media::MediaSample']]],
-  ['createfromhexstrings',['CreateFromHexStrings',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99',1,'shaka::media::FixedKeySource']]],
+  ['createfromhexstrings',['CreateFromHexStrings',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a',1,'shaka::media::FixedKeySource']]],
   ['createmuxeroptions',['CreateMuxerOptions',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e',1,'shaka::media::SegmentTestBase']]],
   ['createsample',['CreateSample',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed',1,'shaka::media::SegmentTestBase']]],
   ['createsigner',['CreateSigner',['../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c',1,'shaka::media::AesRequestSigner::CreateSigner()'],['../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c',1,'shaka::media::RsaRequestSigner::CreateSigner()']]],
diff --git a/docs/search/all_4.js b/docs/search/all_4.js
index 992dc90dc6..cb70b52f7e 100644
--- a/docs/search/all_4.js
+++ b/docs/search/all_4.js
@@ -11,7 +11,7 @@ var searchData=
   ['encrypt',['Encrypt',['../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3',1,'shaka::media::RsaPublicKey']]],
   ['encryptedsegmentpmt',['EncryptedSegmentPmt',['../dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html#a7f40bf474758b80e57fede27c2610756',1,'shaka::media::mp2t::ProgramMapTableWriter::EncryptedSegmentPmt()'],['../de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html#a14d7933ee669e7c5daeb8d03f2f0b1d0',1,'shaka::media::mp2t::H264ProgramMapTableWriter::EncryptedSegmentPmt()'],['../d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html#a37616e314cb20775644b9c5e3417f8e5',1,'shaka::media::mp2t::AacProgramMapTableWriter::EncryptedSegmentPmt()']]],
   ['encryptframe',['EncryptFrame',['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c',1,'shaka::media::webm::Encryptor']]],
-  ['encryptingfragmenter',['EncryptingFragmenter',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4',1,'shaka::media::mp4::EncryptingFragmenter']]],
+  ['encryptingfragmenter',['EncryptingFragmenter',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5',1,'shaka::media::mp4::EncryptingFragmenter']]],
   ['encryptingfragmenter',['EncryptingFragmenter',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html',1,'shaka::media::mp4']]],
   ['encryptionkey',['EncryptionKey',['../dd/dbd/structshaka_1_1media_1_1EncryptionKey.html',1,'shaka::media']]],
   ['encryptor',['Encryptor',['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html',1,'shaka::media::webm']]],
diff --git a/docs/search/all_6.js b/docs/search/all_6.js
index 91432de582..b3009b495d 100644
--- a/docs/search/all_6.js
+++ b/docs/search/all_6.js
@@ -13,7 +13,7 @@ var searchData=
   ['getcontenttype',['GetContentType',['../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090',1,'shaka']]],
   ['getcryptoperiodkey',['GetCryptoPeriodKey',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#afa9abf3a9104cbcb4711eac65c8a5bdf',1,'shaka::media::FixedKeySource::GetCryptoPeriodKey()'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16',1,'shaka::media::KeySource::GetCryptoPeriodKey()'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1',1,'shaka::media::WidevineKeySource::GetCryptoPeriodKey()']]],
   ['getdecoderconfigurationrecord',['GetDecoderConfigurationRecord',['../d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html#a6a7a73841ded1942364f88aad90dcbc9',1,'shaka::media::H264ByteToUnitStreamConverter::GetDecoderConfigurationRecord()'],['../db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html#a9a866e255a2b267f2b44d0156c479de9',1,'shaka::media::H265ByteToUnitStreamConverter::GetDecoderConfigurationRecord()'],['../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html#a57f8a71d948f27303ba41dd5aafb5445',1,'shaka::media::H26xByteToUnitStreamConverter::GetDecoderConfigurationRecord()']]],
-  ['getdecryptconfig',['GetDecryptConfig',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524',1,'shaka::media::mp4::TrackRunIterator']]],
+  ['getdecryptconfig',['GetDecryptConfig',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa',1,'shaka::media::mp4::TrackRunIterator']]],
   ['getduration',['GetDuration',['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2',1,'shaka::media::mp4::Segmenter::GetDuration()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a277aeb59ed41fc484a86101d565017ae',1,'shaka::media::webm::Segmenter::GetDuration()']]],
   ['getfilesize',['GetFileSize',['../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79',1,'shaka::media::File']]],
   ['getheadersize',['GetHeaderSize',['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a3346c5afaf83a18cfcf688c36049d586',1,'shaka::media::VideoSliceHeaderParser::GetHeaderSize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a5957ea62985810662158c02a163aac60',1,'shaka::media::H264VideoSliceHeaderParser::GetHeaderSize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a54459b6748f64be2bd328c5af79798f3',1,'shaka::media::H265VideoSliceHeaderParser::GetHeaderSize()']]],
@@ -24,7 +24,7 @@ var searchData=
   ['getkey',['GetKey',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a267d1f36d1c015fd5e8c20b93f270d0a',1,'shaka::media::FixedKeySource::GetKey(TrackType track_type, EncryptionKey *key) override'],['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a58f9eae1ce9148a82f70118879b6c3f1',1,'shaka::media::FixedKeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key) override'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3',1,'shaka::media::KeySource::GetKey(TrackType track_type, EncryptionKey *key)=0'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#ae33f2cdbd045572095acd7b8d6c1a789',1,'shaka::media::KeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key)=0'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb',1,'shaka::media::WidevineKeySource::GetKey(TrackType track_type, EncryptionKey *key) override'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59699cd998290adae74e6596ba44fdc3',1,'shaka::media::WidevineKeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key) override']]],
   ['getmaxclearoffset',['GetMaxClearOffset',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae7a223474c46dd542e7390030893cca4',1,'shaka::media::mp4::TrackRunIterator']]],
   ['getnext',['GetNext',['../d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html#a63950483c11df9c44e3cb8d559f629d9',1,'shaka::media::mp2t::ContinuityCounter']]],
-  ['getnextpespacket',['GetNextPesPacket',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b',1,'shaka::media::mp2t::PesPacketGenerator']]],
+  ['getnextpespacket',['GetNextPesPacket',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650',1,'shaka::media::mp2t::PesPacketGenerator']]],
   ['getnumchannels',['GetNumChannels',['../d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a2bacb4e7337248bca9e678268e3db491',1,'shaka::media::AACAudioSpecificConfig::GetNumChannels()'],['../d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html#aaa01e3eb1ce9d4400aedd202b04f7160',1,'shaka::media::mp2t::AdtsHeader::GetNumChannels()']]],
   ['getobjecttype',['GetObjectType',['../d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html#a156a3288ab974557e95dfaba72e6b479',1,'shaka::media::mp2t::AdtsHeader']]],
   ['getoutputsamplespersecond',['GetOutputSamplesPerSecond',['../d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a1e34ba8152e2c09452edcdd7e5eb1bcd',1,'shaka::media::AACAudioSpecificConfig']]],
diff --git a/docs/search/all_8.js b/docs/search/all_8.js
index 530e092925..0dc60ec063 100644
--- a/docs/search/all_8.js
+++ b/docs/search/all_8.js
@@ -5,12 +5,12 @@ var searchData=
   ['ignorebytes',['IgnoreBytes',['../d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html#a1a0c70e3124677ae08164f7b89f6a1d4',1,'shaka::media::mp4::BoxBuffer']]],
   ['init',['Init',['../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153',1,'shaka::media::MediaParser::Init()'],['../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52',1,'shaka::media::mp2t::Mp2tMediaParser::Init()'],['../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#acc87b9752a7f6e8c739109acbc02b69d',1,'shaka::media::mp4::MP4MediaParser::Init()'],['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae9f02c32b4e2be8fc41a20f3f00f3494',1,'shaka::media::mp4::TrackRunIterator::Init()'],['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a4d39eaf8568da29b597411c56f50d86f',1,'shaka::media::mp4::TrackRunIterator::Init(const MovieFragment &amp;moof)'],['../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html#a5cd5c298938e2c58c45f962b21e43b2e',1,'shaka::media::WebMMediaParser::Init()'],['../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#af6c0fb7de806cccd0e1f9dd92b5310f3',1,'shaka::media::WebVttMediaParser::Init()'],['../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html#a6f931f1702724a9b19c3078a7832bc77',1,'shaka::media::wvm::WvmMediaParser::Init()'],['../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478',1,'shaka::DashIopMpdNotifier::Init()'],['../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e',1,'shaka::Representation::Init()'],['../d3/dd0/classshaka_1_1MpdNotifier.html#ad6171481d6fb437767b1f5b9e0dac1a3',1,'shaka::MpdNotifier::Init()'],['../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f',1,'shaka::SimpleMpdNotifier::Init()']]],
   ['initcb',['InitCB',['../d3/d0a/classshaka_1_1media_1_1MediaParser.html#a95d25a50ad371304f1abce9971ce3704',1,'shaka::media::MediaParser']]],
-  ['initialize',['Initialize',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad',1,'shaka::media::Demuxer::Initialize()'],['../d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d',1,'shaka::media::NalUnitToByteStreamConverter::Initialize()'],['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d',1,'shaka::media::VideoSliceHeaderParser::Initialize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a551bd1e2a852d1a3b23b77df8505b7f7',1,'shaka::media::H264VideoSliceHeaderParser::Initialize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a83a25520f713f4818a765ea3324a1438',1,'shaka::media::H265VideoSliceHeaderParser::Initialize()'],['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa',1,'shaka::media::mp2t::PesPacketGenerator::Initialize()'],['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2',1,'shaka::media::mp2t::TsSegmenter::Initialize()'],['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6',1,'shaka::media::mp2t::TsWriter::Initialize()'],['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc',1,'shaka::media::mp4::Segmenter::Initialize()'],['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f',1,'shaka::media::webm::Encryptor::Initialize()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a',1,'shaka::media::webm::Segmenter::Initialize()']]],
+  ['initialize',['Initialize',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad',1,'shaka::media::Demuxer::Initialize()'],['../d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d',1,'shaka::media::NalUnitToByteStreamConverter::Initialize()'],['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d',1,'shaka::media::VideoSliceHeaderParser::Initialize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a551bd1e2a852d1a3b23b77df8505b7f7',1,'shaka::media::H264VideoSliceHeaderParser::Initialize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a83a25520f713f4818a765ea3324a1438',1,'shaka::media::H265VideoSliceHeaderParser::Initialize()'],['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa',1,'shaka::media::mp2t::PesPacketGenerator::Initialize()'],['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2',1,'shaka::media::mp2t::TsSegmenter::Initialize()'],['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6',1,'shaka::media::mp2t::TsWriter::Initialize()'],['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc',1,'shaka::media::mp4::Segmenter::Initialize()'],['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f',1,'shaka::media::webm::Encryptor::Initialize()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb',1,'shaka::media::webm::Segmenter::Initialize()']]],
   ['initializefragment',['InitializeFragment',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3',1,'shaka::media::mp4::EncryptingFragmenter::InitializeFragment()'],['../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a',1,'shaka::media::mp4::Fragmenter::InitializeFragment()']]],
   ['initializewithiv',['InitializeWithIv',['../df/d87/classshaka_1_1media_1_1AesCryptor.html#a41954df34b76b04d561892732dd0ec2f',1,'shaka::media::AesCryptor::InitializeWithIv()'],['../df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html#a71ff0b9654de96f9990b29c35fa9b7bf',1,'shaka::media::AesCbcDecryptor::InitializeWithIv()'],['../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa',1,'shaka::media::AesEncryptor::InitializeWithIv()'],['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34',1,'shaka::media::AesPatternCryptor::InitializeWithIv()']]],
-  ['injectclockfortesting',['InjectClockForTesting',['../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450',1,'shaka::MpdBuilder']]],
-  ['injectpespacketgeneratorfortesting',['InjectPesPacketGeneratorForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25',1,'shaka::media::mp2t::TsSegmenter']]],
-  ['injecttswriterfortesting',['InjectTsWriterForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d',1,'shaka::media::mp2t::TsSegmenter']]],
+  ['injectclockfortesting',['InjectClockForTesting',['../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53',1,'shaka::MpdBuilder']]],
+  ['injectpespacketgeneratorfortesting',['InjectPesPacketGeneratorForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c',1,'shaka::media::mp2t::TsSegmenter']]],
+  ['injecttswriterfortesting',['InjectTsWriterForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9',1,'shaka::media::mp2t::TsSegmenter']]],
   ['iocache',['IoCache',['../dd/d7c/classshaka_1_1media_1_1IoCache.html',1,'shaka::media']]],
   ['isaac',['IsAAC',['../d5/d13/classshaka_1_1media_1_1ESDescriptor.html#a47592ec424dc9dd2beb5cc0f505e6681',1,'shaka::media::ESDescriptor']]],
   ['iskeyframe',['IsKeyframe',['../d8/d14/classshaka_1_1media_1_1VP8Parser.html#afae2dcb0c2652d53f2e23c9d3c07db37',1,'shaka::media::VP8Parser::IsKeyframe()'],['../db/d5a/classshaka_1_1media_1_1VP9Parser.html#a52e6a17fa34c5676cd0cdc547cb355a5',1,'shaka::media::VP9Parser::IsKeyframe()']]],
diff --git a/docs/search/all_b.js b/docs/search/all_b.js
index 170eb47d48..a463e32d7c 100644
--- a/docs/search/all_b.js
+++ b/docs/search/all_b.js
@@ -37,8 +37,8 @@ var searchData=
   ['mpdnotifymuxerlistener',['MpdNotifyMuxerListener',['../d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html',1,'shaka::media']]],
   ['mpdoptions',['MpdOptions',['../d1/df3/structshaka_1_1MpdOptions.html',1,'shaka']]],
   ['mpdwriter',['MpdWriter',['../db/dcd/classshaka_1_1MpdWriter.html',1,'shaka']]],
-  ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html',1,'shaka::media::mp4']]],
   ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html',1,'shaka::media::webm']]],
+  ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html',1,'shaka::media::mp4']]],
   ['mutable_5fdata',['mutable_data',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a41aa532d0953db4ed9308ad176c6d878',1,'shaka::media::mp2t::PesPacket']]],
   ['muxer',['Muxer',['../df/d46/classshaka_1_1media_1_1Muxer.html',1,'shaka::media']]],
   ['muxerlistener',['MuxerListener',['../dd/d7a/classshaka_1_1media_1_1MuxerListener.html',1,'shaka::media']]],
diff --git a/docs/search/all_f.js b/docs/search/all_f.js
index 953ce53adf..a61850ad5b 100644
--- a/docs/search/all_f.js
+++ b/docs/search/all_f.js
@@ -19,7 +19,7 @@ var searchData=
   ['release',['Release',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0',1,'shaka::xml::XmlNode']]],
   ['reopen',['Reopen',['../dd/d7c/classshaka_1_1media_1_1IoCache.html#ae751faea047196ba2770f5bf90649185',1,'shaka::media::IoCache']]],
   ['representation',['Representation',['../de/d52/classshaka_1_1Representation.html',1,'shaka']]],
-  ['representation',['Representation',['../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0',1,'shaka::Representation']]],
+  ['representation',['Representation',['../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb',1,'shaka::Representation']]],
   ['representationbasexmlnode',['RepresentationBaseXmlNode',['../dd/db9/classshaka_1_1xml_1_1RepresentationBaseXmlNode.html',1,'shaka::xml']]],
   ['representationstatechangelistener',['RepresentationStateChangeListener',['../df/d94/classshaka_1_1RepresentationStateChangeListener.html',1,'shaka']]],
   ['representationxmlnode',['RepresentationXmlNode',['../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html',1,'shaka::xml']]],
diff --git a/docs/search/classes_a.js b/docs/search/classes_a.js
index 1f95a411a9..1a88d08c76 100644
--- a/docs/search/classes_a.js
+++ b/docs/search/classes_a.js
@@ -30,8 +30,8 @@ var searchData=
   ['mpdnotifymuxerlistener',['MpdNotifyMuxerListener',['../d9/da5/classshaka_1_1media_1_1MpdNotifyMuxerListener.html',1,'shaka::media']]],
   ['mpdoptions',['MpdOptions',['../d1/df3/structshaka_1_1MpdOptions.html',1,'shaka']]],
   ['mpdwriter',['MpdWriter',['../db/dcd/classshaka_1_1MpdWriter.html',1,'shaka']]],
-  ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html',1,'shaka::media::mp4']]],
   ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d2/dd5/classshaka_1_1media_1_1webm_1_1MultiSegmentSegmenter.html',1,'shaka::media::webm']]],
+  ['multisegmentsegmenter',['MultiSegmentSegmenter',['../d8/db7/classshaka_1_1media_1_1mp4_1_1MultiSegmentSegmenter.html',1,'shaka::media::mp4']]],
   ['muxer',['Muxer',['../df/d46/classshaka_1_1media_1_1Muxer.html',1,'shaka::media']]],
   ['muxerlistener',['MuxerListener',['../dd/d7a/classshaka_1_1media_1_1MuxerListener.html',1,'shaka::media']]],
   ['muxeroptions',['MuxerOptions',['../d0/d27/structshaka_1_1media_1_1MuxerOptions.html',1,'shaka::media']]]
diff --git a/docs/search/functions_0.js b/docs/search/functions_0.js
index 6412d98eb7..25f5f48e4c 100644
--- a/docs/search/functions_0.js
+++ b/docs/search/functions_0.js
@@ -11,7 +11,7 @@ var searchData=
   ['addliveonlyinfo',['AddLiveOnlyInfo',['../df/d9e/classshaka_1_1xml_1_1RepresentationXmlNode.html#ae9ff190e1a653a348b00b5edd9d6cc60',1,'shaka::xml::RepresentationXmlNode']]],
   ['addnalu',['AddNalu',['../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#a6b2234ce5bdffaaaad217414df314598',1,'shaka::media::DecoderConfigurationRecord']]],
   ['addnewsegment',['AddNewSegment',['../de/d52/classshaka_1_1Representation.html#a6ca8bbfd34ef8ca782d2ef18aeaad932',1,'shaka::Representation']]],
-  ['addpespacket',['AddPesPacket',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a8b2b5caa68f34a332a377524a5f23e61',1,'shaka::media::mp2t::TsWriter']]],
+  ['addpespacket',['AddPesPacket',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a19a7699df7ac129aedfdff074a8a18a3',1,'shaka::media::mp2t::TsWriter']]],
   ['addrepresentation',['AddRepresentation',['../d8/d8e/classshaka_1_1AdaptationSet.html#a124e3c1ba5e3209f3214a556ecae28c3',1,'shaka::AdaptationSet']]],
   ['addrole',['AddRole',['../d8/d8e/classshaka_1_1AdaptationSet.html#ae96ad89ec7cc7d5ef1db467a9cf13730',1,'shaka::AdaptationSet']]],
   ['addroleelement',['AddRoleElement',['../d1/de7/classshaka_1_1xml_1_1AdaptationSetXmlNode.html#a2718eede55bb89447a74ff802b95fdb1',1,'shaka::xml::AdaptationSetXmlNode']]],
@@ -28,7 +28,7 @@ var searchData=
   ['aescbcencryptor',['AesCbcEncryptor',['../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#a2cc8f20b92d884d959b3a586b527fece',1,'shaka::media::AesCbcEncryptor::AesCbcEncryptor(CbcPaddingScheme padding_scheme)'],['../d4/d20/classshaka_1_1media_1_1AesCbcEncryptor.html#adbe4df9a37be949487a806301d143230',1,'shaka::media::AesCbcEncryptor::AesCbcEncryptor(CbcPaddingScheme padding_scheme, ConstantIvFlag constant_iv_flag)']]],
   ['aescryptor',['AesCryptor',['../df/d87/classshaka_1_1media_1_1AesCryptor.html#a47fbdacc296fbddd899c47ec0c17e5e8',1,'shaka::media::AesCryptor']]],
   ['aesencryptor',['AesEncryptor',['../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a873b0794baca91b36dbc484fc9c37e58',1,'shaka::media::AesEncryptor']]],
-  ['aespatterncryptor',['AesPatternCryptor',['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#ad76aebd0a9f7cc78f6f841cbce359107',1,'shaka::media::AesPatternCryptor']]],
+  ['aespatterncryptor',['AesPatternCryptor',['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#abb94f2d6a527b12854e81839fd10e1d5',1,'shaka::media::AesPatternCryptor']]],
   ['appendint',['AppendInt',['../dc/d41/classshaka_1_1media_1_1BufferWriter.html#abd8854feedd8b45146eb04dacf7d5b2f',1,'shaka::media::BufferWriter']]],
   ['appendnbytes',['AppendNBytes',['../dc/d41/classshaka_1_1media_1_1BufferWriter.html#ae44b09c03c9b8f0fbf58deb80355f299',1,'shaka::media::BufferWriter']]],
   ['audio_5fdescription',['audio_description',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#adb40e673e8025ca51740a50eb20d89b2',1,'shaka::media::mp4::TrackRunIterator']]],
diff --git a/docs/search/functions_10.js b/docs/search/functions_10.js
index 451ec98491..319aa16974 100644
--- a/docs/search/functions_10.js
+++ b/docs/search/functions_10.js
@@ -11,26 +11,26 @@ var searchData=
   ['seekable',['Seekable',['../d1/d0a/classshaka_1_1media_1_1MkvWriter.html#a8d0429e7922752db3f01d43e6340465a',1,'shaka::media::MkvWriter']]],
   ['set_5fclock',['set_clock',['../df/d46/classshaka_1_1media_1_1Muxer.html#a3cc7feaee9a2c3a7d0569cb9c67c8c68',1,'shaka::media::Muxer']]],
   ['set_5fdts',['set_dts',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a9917d625989f0eaac93fec12fec8dca0',1,'shaka::media::mp2t::PesPacket']]],
-  ['set_5fkey_5ffetcher',['set_key_fetcher',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#afc5154b2994b5fe1f8f0c494bbd2bcdd',1,'shaka::media::WidevineKeySource']]],
+  ['set_5fkey_5ffetcher',['set_key_fetcher',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a97c0565df9381e178ebb50c193cebd04',1,'shaka::media::WidevineKeySource']]],
   ['set_5fnalu_5flength_5fsize',['set_nalu_length_size',['../de/de0/classshaka_1_1media_1_1DecoderConfigurationRecord.html#ab0c889c2382b6f41ad1993c136b03d07',1,'shaka::media::DecoderConfigurationRecord']]],
   ['set_5fpts',['set_pts',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#a02ffa1c0ad370f047e6f09b6bbc8b3b8',1,'shaka::media::mp2t::PesPacket']]],
-  ['set_5fsigner',['set_signer',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#abdff0d3cc5f59b744c68b11b0c1f6272',1,'shaka::media::WidevineKeySource']]],
+  ['set_5fsigner',['set_signer',['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a48d182da15ecc85e2ae7fd164ba0a526',1,'shaka::media::WidevineKeySource']]],
   ['set_5fstream_5fid',['set_stream_id',['../d2/d93/classshaka_1_1media_1_1mp2t_1_1PesPacket.html#ad4be259c146b57f61f41638970839fc4',1,'shaka::media::mp2t::PesPacket']]],
   ['set_5fuse_5fdecoding_5ftimestamp_5fin_5ftimeline',['set_use_decoding_timestamp_in_timeline',['../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#a6f9d467d7188160ee445b74b6f0905f4',1,'shaka::media::mp4::Fragmenter']]],
   ['setcluster',['SetCluster',['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a6060ddc97c58e4435d1db932de17e131',1,'shaka::media::webm::Segmenter']]],
   ['setcomplete',['SetComplete',['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#adea4bf88a29660bd8612ae3bc5048068',1,'shaka::media::mp4::Segmenter']]],
   ['setcontent',['SetContent',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a73d758186470e7dbcb4f4339eb53458c',1,'shaka::xml::XmlNode']]],
-  ['setencryptionkey',['SetEncryptionKey',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a346abd50baa9a1e6e42a49ba60f5f916',1,'shaka::media::mp2t::PesPacketGenerator']]],
+  ['setencryptionkey',['SetEncryptionKey',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acc603c661a6e0c592091b8bde5a77e3a',1,'shaka::media::mp2t::PesPacketGenerator']]],
   ['seterror',['SetError',['../d0/d93/classshaka_1_1media_1_1Status.html#a26903fbb0ee18f6b8d7cd441e922b644',1,'shaka::media::Status']]],
   ['setfloatingpointattribute',['SetFloatingPointAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ac4b6c261b14ffe83e9820b76b16af1ba',1,'shaka::xml::XmlNode']]],
   ['setgroup',['SetGroup',['../d8/d8e/classshaka_1_1AdaptationSet.html#ae1f56e719f289e61c27ec51457d697af',1,'shaka::AdaptationSet']]],
   ['setid',['SetId',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#a7479055041708fb681957a838e7ecc1f',1,'shaka::xml::XmlNode']]],
   ['setintegerattribute',['SetIntegerAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ab15dbcc1a051218dc16f44584276ad20',1,'shaka::xml::XmlNode']]],
   ['setiv',['SetIv',['../df/d87/classshaka_1_1media_1_1AesCryptor.html#a4875146da4761bb757d6b00132ae6fea',1,'shaka::media::AesCryptor']]],
-  ['setkeysource',['SetKeySource',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#acad9afa8ef3b5682324a4ded402ab93a',1,'shaka::media::Demuxer::SetKeySource()'],['../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b',1,'shaka::media::Muxer::SetKeySource()']]],
-  ['setmuxerlistener',['SetMuxerListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a786fbb91d7ece58c68334f5cef16ae71',1,'shaka::media::Muxer']]],
-  ['setprogrammaptablewriterfortesting',['SetProgramMapTableWriterForTesting',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a0bead9b328bf6c7c9d5bc6997fea2971',1,'shaka::media::mp2t::TsWriter']]],
-  ['setprogresslistener',['SetProgressListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a0a2dfb3924ce1307f98c339e6587369c',1,'shaka::media::Muxer']]],
+  ['setkeysource',['SetKeySource',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#abfcf3a9a3f64c0e27497c72324049a1e',1,'shaka::media::Demuxer::SetKeySource()'],['../df/d46/classshaka_1_1media_1_1Muxer.html#a021fdae2adc98716b1c8ee7617ab917b',1,'shaka::media::Muxer::SetKeySource()']]],
+  ['setmuxerlistener',['SetMuxerListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a0e76dd0a5c07dd538221459365ae824a',1,'shaka::media::Muxer']]],
+  ['setprogrammaptablewriterfortesting',['SetProgramMapTableWriterForTesting',['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6eeeadf8e60dc09378b5df7c62eb2bf0',1,'shaka::media::mp2t::TsWriter']]],
+  ['setprogresslistener',['SetProgressListener',['../df/d46/classshaka_1_1media_1_1Muxer.html#a25a146d553c385aad70dbff6b3e87eec',1,'shaka::media::Muxer']]],
   ['setsampleduration',['SetSampleDuration',['../de/d52/classshaka_1_1Representation.html#a11b32833166b9c4bea78cca2c6069d98',1,'shaka::Representation']]],
   ['setstringattribute',['SetStringAttribute',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#afc83f9dbaedc8ba0fc9cc1153ac23329',1,'shaka::xml::XmlNode']]],
   ['settswriterfileopenedfortesting',['SetTsWriterFileOpenedForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a34ab9fbaee43115d68be87e4b9e90918',1,'shaka::media::mp2t::TsSegmenter']]],
diff --git a/docs/search/functions_2.js b/docs/search/functions_2.js
index 58d32d1a5f..822392d6b5 100644
--- a/docs/search/functions_2.js
+++ b/docs/search/functions_2.js
@@ -22,12 +22,12 @@ var searchData=
   ['copyfile',['CopyFile',['../d3/d61/classshaka_1_1media_1_1File.html#a1c218b7f815bae0f48800b385ddce67e',1,'shaka::media::File::CopyFile(File *source, File *destination)'],['../d3/d61/classshaka_1_1media_1_1File.html#a9f5ebcd3bdebb7fb02a7a7adf378b344',1,'shaka::media::File::CopyFile(File *source, File *destination, int64_t max_copy)']]],
   ['copyfrom',['CopyFrom',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a3fac8e4cc8da3b34ef5f698411ec868b',1,'shaka::media::MediaSample::CopyFrom(const uint8_t *data, size_t size, bool is_key_frame)'],['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a99f83b1803101853aa03bda8f1251e8c',1,'shaka::media::MediaSample::CopyFrom(const uint8_t *data, size_t size, const uint8_t *side_data, size_t side_data_size, bool is_key_frame)']]],
   ['create',['Create',['../d0/dce/classshaka_1_1media_1_1RsaPrivateKey.html#aef45d0014d7971b936ce3d0109935ba8',1,'shaka::media::RsaPrivateKey::Create()'],['../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#aabe4a2f1541ca1e741305f58329e3881',1,'shaka::media::RsaPublicKey::Create()']]],
-  ['createandinitializesegmenter',['CreateAndInitializeSegmenter',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#adbb73df6171a6caa80cf34c7d63c650d',1,'shaka::media::SegmentTestBase']]],
+  ['createandinitializesegmenter',['CreateAndInitializeSegmenter',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a742824b930ae928f12214a5e350adc64',1,'shaka::media::SegmentTestBase']]],
   ['createbox',['CreateBox',['../d0/dd4/classshaka_1_1media_1_1ProtectionSystemSpecificInfo.html#af9b917cb91b6c10ee7a6f5b41fc7e0d9',1,'shaka::media::ProtectionSystemSpecificInfo']]],
   ['createemptymediasample',['CreateEmptyMediaSample',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a59e7bbd2ee8cfa1697093d14d16a6c4d',1,'shaka::media::MediaSample']]],
   ['createencryptor',['CreateEncryptor',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a4220479b2dd98b462ff4dd4afcf56d0e',1,'shaka::media::mp4::EncryptingFragmenter']]],
   ['createeosbuffer',['CreateEOSBuffer',['../d7/d6d/classshaka_1_1media_1_1MediaSample.html#a925efca004ebbcf3cf71f690a3e43788',1,'shaka::media::MediaSample']]],
-  ['createfromhexstrings',['CreateFromHexStrings',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a091b4ea22419b73f8532db862f985f99',1,'shaka::media::FixedKeySource']]],
+  ['createfromhexstrings',['CreateFromHexStrings',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a9a91ba439d785022a1e2ceeaa9ebe81a',1,'shaka::media::FixedKeySource']]],
   ['createmuxeroptions',['CreateMuxerOptions',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#a89d5ae5a78134e108a4fe4adb6f79e4e',1,'shaka::media::SegmentTestBase']]],
   ['createsample',['CreateSample',['../d2/dba/classshaka_1_1media_1_1SegmentTestBase.html#aa6d43e2cc9d3abe023c037c87807f2ed',1,'shaka::media::SegmentTestBase']]],
   ['createsigner',['CreateSigner',['../d9/d8c/classshaka_1_1media_1_1AesRequestSigner.html#a43f4cc9fad9901fa905805be81f7d58c',1,'shaka::media::AesRequestSigner::CreateSigner()'],['../d7/ddd/classshaka_1_1media_1_1RsaRequestSigner.html#af6af635a7c0a01bb638befb71b88386c',1,'shaka::media::RsaRequestSigner::CreateSigner()']]],
diff --git a/docs/search/functions_4.js b/docs/search/functions_4.js
index f3de324b14..06640a7bb4 100644
--- a/docs/search/functions_4.js
+++ b/docs/search/functions_4.js
@@ -5,5 +5,5 @@ var searchData=
   ['encrypt',['Encrypt',['../d9/d0c/classshaka_1_1media_1_1RsaPublicKey.html#ab9dcf591f3235b8f4eaa02886f9845e3',1,'shaka::media::RsaPublicKey']]],
   ['encryptedsegmentpmt',['EncryptedSegmentPmt',['../dc/d03/classshaka_1_1media_1_1mp2t_1_1ProgramMapTableWriter.html#a7f40bf474758b80e57fede27c2610756',1,'shaka::media::mp2t::ProgramMapTableWriter::EncryptedSegmentPmt()'],['../de/d27/classshaka_1_1media_1_1mp2t_1_1H264ProgramMapTableWriter.html#a14d7933ee669e7c5daeb8d03f2f0b1d0',1,'shaka::media::mp2t::H264ProgramMapTableWriter::EncryptedSegmentPmt()'],['../d4/dc8/classshaka_1_1media_1_1mp2t_1_1AacProgramMapTableWriter.html#a37616e314cb20775644b9c5e3417f8e5',1,'shaka::media::mp2t::AacProgramMapTableWriter::EncryptedSegmentPmt()']]],
   ['encryptframe',['EncryptFrame',['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#a3bfe9e0d99652811cb785832529f3d3c',1,'shaka::media::webm::Encryptor']]],
-  ['encryptingfragmenter',['EncryptingFragmenter',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a5a331edd7e75f6cd15ccbe9c688440a4',1,'shaka::media::mp4::EncryptingFragmenter']]]
+  ['encryptingfragmenter',['EncryptingFragmenter',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a3c1c1037b7d9e6edf1f476434705c3d5',1,'shaka::media::mp4::EncryptingFragmenter']]]
 ];
diff --git a/docs/search/functions_6.js b/docs/search/functions_6.js
index 91432de582..b3009b495d 100644
--- a/docs/search/functions_6.js
+++ b/docs/search/functions_6.js
@@ -13,7 +13,7 @@ var searchData=
   ['getcontenttype',['GetContentType',['../d8/daf/namespaceshaka.html#a5ea880937da26d677ff6a48c0219d090',1,'shaka']]],
   ['getcryptoperiodkey',['GetCryptoPeriodKey',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#afa9abf3a9104cbcb4711eac65c8a5bdf',1,'shaka::media::FixedKeySource::GetCryptoPeriodKey()'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#a18806b962c858e35ed07753687605b16',1,'shaka::media::KeySource::GetCryptoPeriodKey()'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#ab56a71e9f9f9e545f96e667279c05bb1',1,'shaka::media::WidevineKeySource::GetCryptoPeriodKey()']]],
   ['getdecoderconfigurationrecord',['GetDecoderConfigurationRecord',['../d8/d08/classshaka_1_1media_1_1H264ByteToUnitStreamConverter.html#a6a7a73841ded1942364f88aad90dcbc9',1,'shaka::media::H264ByteToUnitStreamConverter::GetDecoderConfigurationRecord()'],['../db/df8/classshaka_1_1media_1_1H265ByteToUnitStreamConverter.html#a9a866e255a2b267f2b44d0156c479de9',1,'shaka::media::H265ByteToUnitStreamConverter::GetDecoderConfigurationRecord()'],['../de/dea/classshaka_1_1media_1_1H26xByteToUnitStreamConverter.html#a57f8a71d948f27303ba41dd5aafb5445',1,'shaka::media::H26xByteToUnitStreamConverter::GetDecoderConfigurationRecord()']]],
-  ['getdecryptconfig',['GetDecryptConfig',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a1badd6160074e1bc2ef0f1e289a81524',1,'shaka::media::mp4::TrackRunIterator']]],
+  ['getdecryptconfig',['GetDecryptConfig',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#af1dbb0a9037617c2b80506ee161dfcfa',1,'shaka::media::mp4::TrackRunIterator']]],
   ['getduration',['GetDuration',['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a7283c64cb63a94264ff8fe405b8ce5c2',1,'shaka::media::mp4::Segmenter::GetDuration()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a277aeb59ed41fc484a86101d565017ae',1,'shaka::media::webm::Segmenter::GetDuration()']]],
   ['getfilesize',['GetFileSize',['../d3/d61/classshaka_1_1media_1_1File.html#a6981994874ee5832e3394744fd51fd79',1,'shaka::media::File']]],
   ['getheadersize',['GetHeaderSize',['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a3346c5afaf83a18cfcf688c36049d586',1,'shaka::media::VideoSliceHeaderParser::GetHeaderSize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a5957ea62985810662158c02a163aac60',1,'shaka::media::H264VideoSliceHeaderParser::GetHeaderSize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a54459b6748f64be2bd328c5af79798f3',1,'shaka::media::H265VideoSliceHeaderParser::GetHeaderSize()']]],
@@ -24,7 +24,7 @@ var searchData=
   ['getkey',['GetKey',['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a267d1f36d1c015fd5e8c20b93f270d0a',1,'shaka::media::FixedKeySource::GetKey(TrackType track_type, EncryptionKey *key) override'],['../d0/dac/classshaka_1_1media_1_1FixedKeySource.html#a58f9eae1ce9148a82f70118879b6c3f1',1,'shaka::media::FixedKeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key) override'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#a994eb66cf09d8b08fd1c964f6afd3ab3',1,'shaka::media::KeySource::GetKey(TrackType track_type, EncryptionKey *key)=0'],['../d1/d1f/classshaka_1_1media_1_1KeySource.html#ae33f2cdbd045572095acd7b8d6c1a789',1,'shaka::media::KeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key)=0'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59a16d61c6a6d05745e8b49fd3618deb',1,'shaka::media::WidevineKeySource::GetKey(TrackType track_type, EncryptionKey *key) override'],['../da/ddd/classshaka_1_1media_1_1WidevineKeySource.html#a59699cd998290adae74e6596ba44fdc3',1,'shaka::media::WidevineKeySource::GetKey(const std::vector&lt; uint8_t &gt; &amp;key_id, EncryptionKey *key) override']]],
   ['getmaxclearoffset',['GetMaxClearOffset',['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae7a223474c46dd542e7390030893cca4',1,'shaka::media::mp4::TrackRunIterator']]],
   ['getnext',['GetNext',['../d8/dd6/classshaka_1_1media_1_1mp2t_1_1ContinuityCounter.html#a63950483c11df9c44e3cb8d559f629d9',1,'shaka::media::mp2t::ContinuityCounter']]],
-  ['getnextpespacket',['GetNextPesPacket',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#a9834c58c732715a51c57a2a6385a761b',1,'shaka::media::mp2t::PesPacketGenerator']]],
+  ['getnextpespacket',['GetNextPesPacket',['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#acf11010f62ab9d2b46308f2cce8b3650',1,'shaka::media::mp2t::PesPacketGenerator']]],
   ['getnumchannels',['GetNumChannels',['../d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a2bacb4e7337248bca9e678268e3db491',1,'shaka::media::AACAudioSpecificConfig::GetNumChannels()'],['../d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html#aaa01e3eb1ce9d4400aedd202b04f7160',1,'shaka::media::mp2t::AdtsHeader::GetNumChannels()']]],
   ['getobjecttype',['GetObjectType',['../d3/d0c/classshaka_1_1media_1_1mp2t_1_1AdtsHeader.html#a156a3288ab974557e95dfaba72e6b479',1,'shaka::media::mp2t::AdtsHeader']]],
   ['getoutputsamplespersecond',['GetOutputSamplesPerSecond',['../d0/da2/classshaka_1_1media_1_1AACAudioSpecificConfig.html#a1e34ba8152e2c09452edcdd7e5eb1bcd',1,'shaka::media::AACAudioSpecificConfig']]],
diff --git a/docs/search/functions_8.js b/docs/search/functions_8.js
index 3e9a3d1a93..d553c9170d 100644
--- a/docs/search/functions_8.js
+++ b/docs/search/functions_8.js
@@ -3,12 +3,12 @@ var searchData=
   ['id',['id',['../de/d52/classshaka_1_1Representation.html#a6a3ba385179698e57a1451d1a26ad827',1,'shaka::Representation']]],
   ['ignorebytes',['IgnoreBytes',['../d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html#a1a0c70e3124677ae08164f7b89f6a1d4',1,'shaka::media::mp4::BoxBuffer']]],
   ['init',['Init',['../d3/d0a/classshaka_1_1media_1_1MediaParser.html#adc7c91bebe75879abba91a56dae52153',1,'shaka::media::MediaParser::Init()'],['../d3/dc1/classshaka_1_1media_1_1mp2t_1_1Mp2tMediaParser.html#aa2aff12312827aacf2b7db6e2f792c52',1,'shaka::media::mp2t::Mp2tMediaParser::Init()'],['../d7/dd5/classshaka_1_1media_1_1mp4_1_1MP4MediaParser.html#acc87b9752a7f6e8c739109acbc02b69d',1,'shaka::media::mp4::MP4MediaParser::Init()'],['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#ae9f02c32b4e2be8fc41a20f3f00f3494',1,'shaka::media::mp4::TrackRunIterator::Init()'],['../de/df6/classshaka_1_1media_1_1mp4_1_1TrackRunIterator.html#a4d39eaf8568da29b597411c56f50d86f',1,'shaka::media::mp4::TrackRunIterator::Init(const MovieFragment &amp;moof)'],['../d2/ddb/classshaka_1_1media_1_1WebMMediaParser.html#a5cd5c298938e2c58c45f962b21e43b2e',1,'shaka::media::WebMMediaParser::Init()'],['../dc/df2/classshaka_1_1media_1_1WebVttMediaParser.html#af6c0fb7de806cccd0e1f9dd92b5310f3',1,'shaka::media::WebVttMediaParser::Init()'],['../dc/d18/classshaka_1_1media_1_1wvm_1_1WvmMediaParser.html#a6f931f1702724a9b19c3078a7832bc77',1,'shaka::media::wvm::WvmMediaParser::Init()'],['../d4/d70/classshaka_1_1DashIopMpdNotifier.html#a9dd9d655a538ff2618634ca1f9809478',1,'shaka::DashIopMpdNotifier::Init()'],['../de/d52/classshaka_1_1Representation.html#ae998409ae94f3ba12909a96e8f3f4f7e',1,'shaka::Representation::Init()'],['../d3/dd0/classshaka_1_1MpdNotifier.html#ad6171481d6fb437767b1f5b9e0dac1a3',1,'shaka::MpdNotifier::Init()'],['../d8/de1/classshaka_1_1SimpleMpdNotifier.html#a59bcb401b5ca8d5b893ec7da9461569f',1,'shaka::SimpleMpdNotifier::Init()']]],
-  ['initialize',['Initialize',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad',1,'shaka::media::Demuxer::Initialize()'],['../d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d',1,'shaka::media::NalUnitToByteStreamConverter::Initialize()'],['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d',1,'shaka::media::VideoSliceHeaderParser::Initialize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a551bd1e2a852d1a3b23b77df8505b7f7',1,'shaka::media::H264VideoSliceHeaderParser::Initialize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a83a25520f713f4818a765ea3324a1438',1,'shaka::media::H265VideoSliceHeaderParser::Initialize()'],['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa',1,'shaka::media::mp2t::PesPacketGenerator::Initialize()'],['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2',1,'shaka::media::mp2t::TsSegmenter::Initialize()'],['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6',1,'shaka::media::mp2t::TsWriter::Initialize()'],['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc',1,'shaka::media::mp4::Segmenter::Initialize()'],['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f',1,'shaka::media::webm::Encryptor::Initialize()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#a144b19be7c3f693b06da2fbe2e40587a',1,'shaka::media::webm::Segmenter::Initialize()']]],
+  ['initialize',['Initialize',['../dd/d17/classshaka_1_1media_1_1Demuxer.html#a436ed9fd2a3ddd78056ec7cf656fd9ad',1,'shaka::media::Demuxer::Initialize()'],['../d5/d66/classshaka_1_1media_1_1NalUnitToByteStreamConverter.html#aa84e36b83b1caa2b1f726c4d3cff3d6d',1,'shaka::media::NalUnitToByteStreamConverter::Initialize()'],['../dd/de4/classshaka_1_1media_1_1VideoSliceHeaderParser.html#a862422cdf78f370069055037338fa53d',1,'shaka::media::VideoSliceHeaderParser::Initialize()'],['../da/df0/classshaka_1_1media_1_1H264VideoSliceHeaderParser.html#a551bd1e2a852d1a3b23b77df8505b7f7',1,'shaka::media::H264VideoSliceHeaderParser::Initialize()'],['../d1/d79/classshaka_1_1media_1_1H265VideoSliceHeaderParser.html#a83a25520f713f4818a765ea3324a1438',1,'shaka::media::H265VideoSliceHeaderParser::Initialize()'],['../d5/de0/classshaka_1_1media_1_1mp2t_1_1PesPacketGenerator.html#aa0346189f99b2f0fc2c71da1543155fa',1,'shaka::media::mp2t::PesPacketGenerator::Initialize()'],['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a412be69ae8e18c5ceb3c48d1559c79c2',1,'shaka::media::mp2t::TsSegmenter::Initialize()'],['../de/d64/classshaka_1_1media_1_1mp2t_1_1TsWriter.html#a6bee605be771538f78633e2ecfc979c6',1,'shaka::media::mp2t::TsWriter::Initialize()'],['../d9/d26/classshaka_1_1media_1_1mp4_1_1Segmenter.html#a0440c751fd818964397d17330acc7afc',1,'shaka::media::mp4::Segmenter::Initialize()'],['../de/dfa/classshaka_1_1media_1_1webm_1_1Encryptor.html#afa6065049fad093b96643b9e3d70595f',1,'shaka::media::webm::Encryptor::Initialize()'],['../dd/dc5/classshaka_1_1media_1_1webm_1_1Segmenter.html#aa6b32c805c4e662d97244531723ce9eb',1,'shaka::media::webm::Segmenter::Initialize()']]],
   ['initializefragment',['InitializeFragment',['../dc/df3/classshaka_1_1media_1_1mp4_1_1EncryptingFragmenter.html#a126294f104809268975fe04391902ad3',1,'shaka::media::mp4::EncryptingFragmenter::InitializeFragment()'],['../db/d95/classshaka_1_1media_1_1mp4_1_1Fragmenter.html#aa702c2af5ea5096d94f2943076a21e4a',1,'shaka::media::mp4::Fragmenter::InitializeFragment()']]],
   ['initializewithiv',['InitializeWithIv',['../df/d87/classshaka_1_1media_1_1AesCryptor.html#a41954df34b76b04d561892732dd0ec2f',1,'shaka::media::AesCryptor::InitializeWithIv()'],['../df/d2d/classshaka_1_1media_1_1AesCbcDecryptor.html#a71ff0b9654de96f9990b29c35fa9b7bf',1,'shaka::media::AesCbcDecryptor::InitializeWithIv()'],['../d3/d75/classshaka_1_1media_1_1AesEncryptor.html#a0695df5615cadf6977fdbac978daeffa',1,'shaka::media::AesEncryptor::InitializeWithIv()'],['../d3/dfe/classshaka_1_1media_1_1AesPatternCryptor.html#af878688f0f277f3f6757e85654439c34',1,'shaka::media::AesPatternCryptor::InitializeWithIv()']]],
-  ['injectclockfortesting',['InjectClockForTesting',['../dc/da1/classshaka_1_1MpdBuilder.html#a723afe73b9d619a1178ae21e46fd7450',1,'shaka::MpdBuilder']]],
-  ['injectpespacketgeneratorfortesting',['InjectPesPacketGeneratorForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a01c6ce7398b8e7a9966959dadcd30b25',1,'shaka::media::mp2t::TsSegmenter']]],
-  ['injecttswriterfortesting',['InjectTsWriterForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#a2bf9d53ebc0a42551e7c460d9464650d',1,'shaka::media::mp2t::TsSegmenter']]],
+  ['injectclockfortesting',['InjectClockForTesting',['../dc/da1/classshaka_1_1MpdBuilder.html#a7a4f96f12b589cfc4b5c2f44532eec53',1,'shaka::MpdBuilder']]],
+  ['injectpespacketgeneratorfortesting',['InjectPesPacketGeneratorForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#abb78b18426643d58bc44ea61823dc29c',1,'shaka::media::mp2t::TsSegmenter']]],
+  ['injecttswriterfortesting',['InjectTsWriterForTesting',['../de/dde/classshaka_1_1media_1_1mp2t_1_1TsSegmenter.html#ae3ed0f86d2163444e24a2577e35517a9',1,'shaka::media::mp2t::TsSegmenter']]],
   ['isaac',['IsAAC',['../d5/d13/classshaka_1_1media_1_1ESDescriptor.html#a47592ec424dc9dd2beb5cc0f505e6681',1,'shaka::media::ESDescriptor']]],
   ['iskeyframe',['IsKeyframe',['../d8/d14/classshaka_1_1media_1_1VP8Parser.html#afae2dcb0c2652d53f2e23c9d3c07db37',1,'shaka::media::VP8Parser::IsKeyframe()'],['../db/d5a/classshaka_1_1media_1_1VP9Parser.html#a52e6a17fa34c5676cd0cdc547cb355a5',1,'shaka::media::VP9Parser::IsKeyframe()']]],
   ['isparsingcomplete',['IsParsingComplete',['../dc/dca/classshaka_1_1media_1_1WebMListParser.html#acf786fc2e07143c3f1a481401240d105',1,'shaka::media::WebMListParser']]],
diff --git a/docs/search/functions_f.js b/docs/search/functions_f.js
index 3724ce564f..d58f822997 100644
--- a/docs/search/functions_f.js
+++ b/docs/search/functions_f.js
@@ -18,7 +18,7 @@ var searchData=
   ['readwriteuint64nbytes',['ReadWriteUInt64NBytes',['../d1/da1/classshaka_1_1media_1_1mp4_1_1BoxBuffer.html#a53c6b6a9bce0bb0fa61b9ce95c3f5cef',1,'shaka::media::mp4::BoxBuffer']]],
   ['release',['Release',['../d1/d31/classshaka_1_1xml_1_1XmlNode.html#ae5cb2c3000ccbd53c0a1867db0b8a2d0',1,'shaka::xml::XmlNode']]],
   ['reopen',['Reopen',['../dd/d7c/classshaka_1_1media_1_1IoCache.html#ae751faea047196ba2770f5bf90649185',1,'shaka::media::IoCache']]],
-  ['representation',['Representation',['../de/d52/classshaka_1_1Representation.html#ad029323166bb60175a2369c3e887dca0',1,'shaka::Representation']]],
+  ['representation',['Representation',['../de/d52/classshaka_1_1Representation.html#a997138fcaa5deef5151a64a2d7ce6aeb',1,'shaka::Representation']]],
   ['reset',['Reset',['../d7/dda/classshaka_1_1media_1_1ByteQueue.html#ab1659ef71098c37e9fb4e55ab1664e84',1,'shaka::media::ByteQueue::Reset()'],['../d3/d7c/classshaka_1_1media_1_1WebMAudioClient.html#afd1a338848c52dc4db79d89ae13b6ea6',1,'shaka::media::WebMAudioClient::Reset()'],['../da/de4/classshaka_1_1media_1_1WebMClusterParser.html#abb306c3299a7279125b8f321ef5bbc94',1,'shaka::media::WebMClusterParser::Reset()'],['../dc/dca/classshaka_1_1media_1_1WebMListParser.html#a4ebac4e1a4165017d206d4aa5c4c0350',1,'shaka::media::WebMListParser::Reset()'],['../d3/d67/classshaka_1_1media_1_1WebMVideoClient.html#af3ad16a6046f60abf43a798747fc1edc',1,'shaka::media::WebMVideoClient::Reset()']]],
   ['run',['Run',['../dc/df0/classshaka_1_1media_1_1ClosureThread.html#a2c95d317c0b83b66ac7991c3506dc4e7',1,'shaka::media::ClosureThread::Run()'],['../dd/d17/classshaka_1_1media_1_1Demuxer.html#a9e0b4a430603fdf4639c2153622ae1a2',1,'shaka::media::Demuxer::Run()'],['../df/d46/classshaka_1_1media_1_1Muxer.html#adc96fbcd6a4d4ba9845f8d00974ace0f',1,'shaka::media::Muxer::Run()']]]
 ];