From 4f9c8ea7817b397c4f2dd83311f528200650bd3d Mon Sep 17 00:00:00 2001 From: Kongqun Yang Date: Fri, 20 May 2016 14:19:33 -0700 Subject: [PATCH] Rename top level namespace to shaka Issue #103 Change-Id: I67945c8ec6d2c178494d3b5400e5ec0170e9d115 --- packager/app/fixed_key_encryption_flags.cc | 4 ++-- packager/app/fixed_key_encryption_flags.h | 4 ++-- packager/app/libcrypto_threading.cc | 4 ++-- packager/app/libcrypto_threading.h | 4 ++-- packager/app/mpd_generator.cc | 6 +++--- packager/app/packager_main.cc | 6 +++--- packager/app/packager_util.cc | 4 ++-- packager/app/packager_util.h | 4 ++-- packager/app/stream_descriptor.cc | 4 ++-- packager/app/stream_descriptor.h | 4 ++-- packager/app/validate_flag.cc | 4 ++-- packager/app/validate_flag.h | 4 ++-- packager/app/widevine_encryption_flags.cc | 4 ++-- packager/app/widevine_encryption_flags.h | 4 ++-- packager/hls/base/hls_notifier.h | 4 ++-- packager/hls/base/master_playlist.cc | 4 ++-- packager/hls/base/master_playlist.h | 4 ++-- packager/hls/base/master_playlist_unittest.cc | 4 ++-- packager/hls/base/media_playlist.cc | 4 ++-- packager/hls/base/media_playlist.h | 4 ++-- packager/hls/base/media_playlist_unittest.cc | 4 ++-- packager/hls/base/mock_media_playlist.cc | 4 ++-- packager/hls/base/mock_media_playlist.h | 4 ++-- packager/hls/base/simple_hls_notifier.cc | 4 ++-- packager/hls/base/simple_hls_notifier.h | 4 ++-- packager/hls/base/simple_hls_notifier_unittest.cc | 4 ++-- packager/media/base/aes_cryptor.cc | 4 ++-- packager/media/base/aes_cryptor.h | 4 ++-- packager/media/base/aes_cryptor_unittest.cc | 4 ++-- packager/media/base/aes_decryptor.cc | 4 ++-- packager/media/base/aes_decryptor.h | 4 ++-- packager/media/base/aes_encryptor.cc | 4 ++-- packager/media/base/aes_encryptor.h | 4 ++-- packager/media/base/aes_pattern_cryptor.cc | 4 ++-- packager/media/base/aes_pattern_cryptor.h | 4 ++-- packager/media/base/aes_pattern_cryptor_unittest.cc | 4 ++-- packager/media/base/audio_stream_info.cc | 4 ++-- packager/media/base/audio_stream_info.h | 4 ++-- packager/media/base/audio_timestamp_helper.cc | 4 ++-- packager/media/base/audio_timestamp_helper.h | 4 ++-- packager/media/base/audio_timestamp_helper_unittest.cc | 4 ++-- packager/media/base/bit_reader.cc | 4 ++-- packager/media/base/bit_reader.h | 4 ++-- packager/media/base/bit_reader_unittest.cc | 4 ++-- packager/media/base/buffer_reader.cc | 4 ++-- packager/media/base/buffer_reader.h | 4 ++-- packager/media/base/buffer_writer.cc | 4 ++-- packager/media/base/buffer_writer.h | 4 ++-- packager/media/base/buffer_writer_unittest.cc | 4 ++-- packager/media/base/byte_queue.cc | 4 ++-- packager/media/base/byte_queue.h | 4 ++-- packager/media/base/closure_thread.cc | 4 ++-- packager/media/base/closure_thread.h | 4 ++-- packager/media/base/closure_thread_unittest.cc | 4 ++-- packager/media/base/container_names.cc | 4 ++-- packager/media/base/container_names.h | 4 ++-- packager/media/base/container_names_unittest.cc | 4 ++-- packager/media/base/decrypt_config.cc | 4 ++-- packager/media/base/decrypt_config.h | 4 ++-- packager/media/base/decryptor_source.cc | 4 ++-- packager/media/base/decryptor_source.h | 4 ++-- packager/media/base/decryptor_source_unittest.cc | 4 ++-- packager/media/base/demuxer.cc | 4 ++-- packager/media/base/demuxer.h | 4 ++-- packager/media/base/fixed_key_source.cc | 4 ++-- packager/media/base/fixed_key_source.h | 4 ++-- packager/media/base/fixed_key_source_unittest.cc | 4 ++-- packager/media/base/fourccs.h | 4 ++-- packager/media/base/http_key_fetcher.cc | 4 ++-- packager/media/base/http_key_fetcher.h | 4 ++-- packager/media/base/http_key_fetcher_unittest.cc | 4 ++-- packager/media/base/key_fetcher.cc | 4 ++-- packager/media/base/key_fetcher.h | 4 ++-- packager/media/base/key_source.cc | 4 ++-- packager/media/base/key_source.h | 4 ++-- packager/media/base/limits.h | 4 ++-- packager/media/base/media_parser.h | 4 ++-- packager/media/base/media_sample.cc | 4 ++-- packager/media/base/media_sample.h | 4 ++-- packager/media/base/media_stream.cc | 4 ++-- packager/media/base/media_stream.h | 4 ++-- packager/media/base/muxer.cc | 4 ++-- packager/media/base/muxer.h | 4 ++-- packager/media/base/muxer_options.cc | 4 ++-- packager/media/base/muxer_options.h | 4 ++-- packager/media/base/muxer_util.cc | 4 ++-- packager/media/base/muxer_util.h | 4 ++-- packager/media/base/muxer_util_unittest.cc | 4 ++-- packager/media/base/network_util.cc | 4 ++-- packager/media/base/network_util.h | 4 ++-- packager/media/base/offset_byte_queue.cc | 4 ++-- packager/media/base/offset_byte_queue.h | 4 ++-- packager/media/base/offset_byte_queue_unittest.cc | 4 ++-- packager/media/base/producer_consumer_queue.h | 4 ++-- packager/media/base/producer_consumer_queue_unittest.cc | 4 ++-- packager/media/base/protection_system_specific_info.cc | 4 ++-- packager/media/base/protection_system_specific_info.h | 4 ++-- .../media/base/protection_system_specific_info_unittest.cc | 4 ++-- packager/media/base/request_signer.cc | 4 ++-- packager/media/base/request_signer.h | 4 ++-- packager/media/base/rsa_key.cc | 4 ++-- packager/media/base/rsa_key.h | 4 ++-- packager/media/base/rsa_key_unittest.cc | 4 ++-- packager/media/base/status.cc | 4 ++-- packager/media/base/status.h | 4 ++-- packager/media/base/status_test_util_unittest.cc | 4 ++-- packager/media/base/status_unittest.cc | 4 ++-- packager/media/base/stream_info.cc | 4 ++-- packager/media/base/stream_info.h | 4 ++-- packager/media/base/test/fake_prng.cc | 4 ++-- packager/media/base/test/fake_prng.h | 4 ++-- packager/media/base/test/rsa_test_data.cc | 4 ++-- packager/media/base/test/rsa_test_data.h | 4 ++-- packager/media/base/test/status_test_util.h | 4 ++-- packager/media/base/text_stream_info.cc | 4 ++-- packager/media/base/text_stream_info.h | 4 ++-- packager/media/base/text_track.h | 4 ++-- packager/media/base/text_track_config.cc | 4 ++-- packager/media/base/text_track_config.h | 4 ++-- packager/media/base/timestamp.h | 4 ++-- packager/media/base/video_stream_info.cc | 4 ++-- packager/media/base/video_stream_info.h | 4 ++-- packager/media/base/widevine_key_source.cc | 4 ++-- packager/media/base/widevine_key_source.h | 4 ++-- packager/media/base/widevine_key_source_unittest.cc | 4 ++-- packager/media/base/widevine_pssh_data.proto | 2 +- packager/media/event/hls_notify_muxer_listener.cc | 4 ++-- packager/media/event/hls_notify_muxer_listener.h | 4 ++-- packager/media/event/hls_notify_muxer_listener_unittest.cc | 4 ++-- packager/media/event/mock_muxer_listener.cc | 4 ++-- packager/media/event/mock_muxer_listener.h | 4 ++-- packager/media/event/mpd_notify_muxer_listener.cc | 4 ++-- packager/media/event/mpd_notify_muxer_listener.h | 4 ++-- packager/media/event/mpd_notify_muxer_listener_unittest.cc | 4 ++-- packager/media/event/muxer_listener.h | 4 ++-- packager/media/event/muxer_listener_internal.cc | 4 ++-- packager/media/event/muxer_listener_internal.h | 4 ++-- packager/media/event/muxer_listener_test_helper.cc | 4 ++-- packager/media/event/muxer_listener_test_helper.h | 4 ++-- packager/media/event/progress_listener.h | 4 ++-- packager/media/event/vod_media_info_dump_muxer_listener.cc | 4 ++-- packager/media/event/vod_media_info_dump_muxer_listener.h | 4 ++-- .../event/vod_media_info_dump_muxer_listener_unittest.cc | 4 ++-- packager/media/file/file.cc | 4 ++-- packager/media/file/file.h | 4 ++-- packager/media/file/file_closer.h | 4 ++-- packager/media/file/file_test_util.h | 4 ++-- packager/media/file/file_unittest.cc | 4 ++-- packager/media/file/io_cache.cc | 4 ++-- packager/media/file/io_cache.h | 4 ++-- packager/media/file/io_cache_unittest.cc | 4 ++-- packager/media/file/local_file.cc | 4 ++-- packager/media/file/local_file.h | 4 ++-- packager/media/file/memory_file.cc | 4 ++-- packager/media/file/memory_file.h | 4 ++-- packager/media/file/memory_file_unittest.cc | 4 ++-- packager/media/file/threaded_io_file.cc | 4 ++-- packager/media/file/threaded_io_file.h | 4 ++-- packager/media/file/udp_file.h | 4 ++-- packager/media/file/udp_file_posix.cc | 4 ++-- packager/media/file/udp_file_win.cc | 4 ++-- packager/media/filters/avc_decoder_configuration.cc | 4 ++-- packager/media/filters/avc_decoder_configuration.h | 4 ++-- .../media/filters/avc_decoder_configuration_unittest.cc | 4 ++-- packager/media/filters/decoder_configuration.cc | 4 ++-- packager/media/filters/decoder_configuration.h | 4 ++-- packager/media/filters/ec3_audio_util.cc | 4 ++-- packager/media/filters/ec3_audio_util.h | 4 ++-- packager/media/filters/ec3_audio_util_unittest.cc | 4 ++-- .../media/filters/h264_byte_to_unit_stream_converter.cc | 4 ++-- packager/media/filters/h264_byte_to_unit_stream_converter.h | 4 ++-- .../filters/h264_byte_to_unit_stream_converter_unittest.cc | 4 ++-- packager/media/filters/h264_parser.cc | 4 ++-- packager/media/filters/h264_parser.h | 4 ++-- packager/media/filters/h264_parser_unittest.cc | 4 ++-- .../media/filters/h265_byte_to_unit_stream_converter.cc | 4 ++-- packager/media/filters/h265_byte_to_unit_stream_converter.h | 4 ++-- .../filters/h265_byte_to_unit_stream_converter_unittest.cc | 4 ++-- packager/media/filters/h265_parser.cc | 4 ++-- packager/media/filters/h265_parser.h | 4 ++-- packager/media/filters/h265_parser_unittest.cc | 4 ++-- packager/media/filters/h26x_bit_reader.cc | 4 ++-- packager/media/filters/h26x_bit_reader.h | 4 ++-- packager/media/filters/h26x_bit_reader_unittest.cc | 4 ++-- .../media/filters/h26x_byte_to_unit_stream_converter.cc | 4 ++-- packager/media/filters/h26x_byte_to_unit_stream_converter.h | 4 ++-- packager/media/filters/hevc_decoder_configuration.cc | 4 ++-- packager/media/filters/hevc_decoder_configuration.h | 4 ++-- .../media/filters/hevc_decoder_configuration_unittest.cc | 4 ++-- packager/media/filters/nal_unit_to_byte_stream_converter.cc | 4 ++-- packager/media/filters/nal_unit_to_byte_stream_converter.h | 4 ++-- .../filters/nal_unit_to_byte_stream_converter_unittest.cc | 4 ++-- packager/media/filters/nalu_reader.cc | 4 ++-- packager/media/filters/nalu_reader.h | 4 ++-- packager/media/filters/nalu_reader_unittest.cc | 4 ++-- packager/media/filters/vp8_parser.cc | 4 ++-- packager/media/filters/vp8_parser.h | 4 ++-- packager/media/filters/vp8_parser_unittest.cc | 4 ++-- packager/media/filters/vp9_parser.cc | 4 ++-- packager/media/filters/vp9_parser.h | 4 ++-- packager/media/filters/vp9_parser_unittest.cc | 4 ++-- packager/media/filters/vp_codec_configuration.cc | 4 ++-- packager/media/filters/vp_codec_configuration.h | 4 ++-- packager/media/filters/vp_codec_configuration_unittest.cc | 4 ++-- packager/media/filters/vpx_parser.h | 4 ++-- packager/media/filters/webvtt_util.h | 4 ++-- packager/media/formats/mp2t/adts_header.cc | 4 ++-- packager/media/formats/mp2t/adts_header.h | 4 ++-- packager/media/formats/mp2t/adts_header_unittest.cc | 4 ++-- packager/media/formats/mp2t/continuity_counter.cc | 4 ++-- packager/media/formats/mp2t/continuity_counter.h | 4 ++-- packager/media/formats/mp2t/es_parser.h | 4 ++-- packager/media/formats/mp2t/es_parser_adts.cc | 4 ++-- packager/media/formats/mp2t/es_parser_adts.h | 4 ++-- packager/media/formats/mp2t/es_parser_h264.cc | 4 ++-- packager/media/formats/mp2t/es_parser_h264.h | 4 ++-- packager/media/formats/mp2t/es_parser_h264_unittest.cc | 4 ++-- packager/media/formats/mp2t/es_parser_h265.cc | 4 ++-- packager/media/formats/mp2t/es_parser_h265.h | 4 ++-- packager/media/formats/mp2t/es_parser_h26x.cc | 4 ++-- packager/media/formats/mp2t/es_parser_h26x.h | 4 ++-- packager/media/formats/mp2t/es_parser_h26x_unittest.cc | 4 ++-- packager/media/formats/mp2t/mp2t_common.h | 4 ++-- packager/media/formats/mp2t/mp2t_media_parser.cc | 4 ++-- packager/media/formats/mp2t/mp2t_media_parser.h | 4 ++-- packager/media/formats/mp2t/mp2t_media_parser_unittest.cc | 4 ++-- packager/media/formats/mp2t/pes_packet.cc | 4 ++-- packager/media/formats/mp2t/pes_packet.h | 4 ++-- packager/media/formats/mp2t/pes_packet_generator.cc | 4 ++-- packager/media/formats/mp2t/pes_packet_generator.h | 4 ++-- .../media/formats/mp2t/pes_packet_generator_unittest.cc | 4 ++-- packager/media/formats/mp2t/program_map_table_writer.cc | 4 ++-- packager/media/formats/mp2t/program_map_table_writer.h | 4 ++-- .../media/formats/mp2t/program_map_table_writer_unittest.cc | 4 ++-- packager/media/formats/mp2t/ts_muxer.cc | 4 ++-- packager/media/formats/mp2t/ts_muxer.h | 4 ++-- packager/media/formats/mp2t/ts_packet.cc | 4 ++-- packager/media/formats/mp2t/ts_packet.h | 4 ++-- packager/media/formats/mp2t/ts_packet_writer_util.cc | 4 ++-- packager/media/formats/mp2t/ts_packet_writer_util.h | 4 ++-- packager/media/formats/mp2t/ts_section.h | 4 ++-- packager/media/formats/mp2t/ts_section_pat.cc | 4 ++-- packager/media/formats/mp2t/ts_section_pat.h | 4 ++-- packager/media/formats/mp2t/ts_section_pes.cc | 4 ++-- packager/media/formats/mp2t/ts_section_pes.h | 4 ++-- packager/media/formats/mp2t/ts_section_pmt.cc | 4 ++-- packager/media/formats/mp2t/ts_section_pmt.h | 4 ++-- packager/media/formats/mp2t/ts_section_psi.cc | 4 ++-- packager/media/formats/mp2t/ts_section_psi.h | 4 ++-- packager/media/formats/mp2t/ts_segmenter.cc | 4 ++-- packager/media/formats/mp2t/ts_segmenter.h | 4 ++-- packager/media/formats/mp2t/ts_segmenter_unittest.cc | 4 ++-- packager/media/formats/mp2t/ts_writer.cc | 4 ++-- packager/media/formats/mp2t/ts_writer.h | 4 ++-- packager/media/formats/mp2t/ts_writer_unittest.cc | 4 ++-- packager/media/formats/mp4/aac_audio_specific_config.cc | 4 ++-- packager/media/formats/mp4/aac_audio_specific_config.h | 4 ++-- .../media/formats/mp4/aac_audio_specific_config_unittest.cc | 4 ++-- packager/media/formats/mp4/box.cc | 4 ++-- packager/media/formats/mp4/box.h | 4 ++-- packager/media/formats/mp4/box_buffer.h | 4 ++-- packager/media/formats/mp4/box_definitions.cc | 4 ++-- packager/media/formats/mp4/box_definitions.h | 4 ++-- packager/media/formats/mp4/box_definitions_comparison.h | 4 ++-- packager/media/formats/mp4/box_definitions_unittest.cc | 4 ++-- packager/media/formats/mp4/box_reader.cc | 4 ++-- packager/media/formats/mp4/box_reader.h | 4 ++-- packager/media/formats/mp4/box_reader_unittest.cc | 4 ++-- packager/media/formats/mp4/chunk_info_iterator.cc | 4 ++-- packager/media/formats/mp4/chunk_info_iterator.h | 4 ++-- packager/media/formats/mp4/chunk_info_iterator_unittest.cc | 4 ++-- packager/media/formats/mp4/composition_offset_iterator.cc | 4 ++-- packager/media/formats/mp4/composition_offset_iterator.h | 4 ++-- .../formats/mp4/composition_offset_iterator_unittest.cc | 4 ++-- packager/media/formats/mp4/decoding_time_iterator.cc | 4 ++-- packager/media/formats/mp4/decoding_time_iterator.h | 4 ++-- .../media/formats/mp4/decoding_time_iterator_unittest.cc | 4 ++-- packager/media/formats/mp4/encrypting_fragmenter.cc | 4 ++-- packager/media/formats/mp4/encrypting_fragmenter.h | 4 ++-- packager/media/formats/mp4/es_descriptor.cc | 4 ++-- packager/media/formats/mp4/es_descriptor.h | 4 ++-- packager/media/formats/mp4/es_descriptor_unittest.cc | 4 ++-- packager/media/formats/mp4/fragmenter.cc | 4 ++-- packager/media/formats/mp4/fragmenter.h | 4 ++-- packager/media/formats/mp4/key_rotation_fragmenter.cc | 4 ++-- packager/media/formats/mp4/key_rotation_fragmenter.h | 4 ++-- packager/media/formats/mp4/mp4_media_parser.cc | 4 ++-- packager/media/formats/mp4/mp4_media_parser.h | 4 ++-- packager/media/formats/mp4/mp4_media_parser_unittest.cc | 4 ++-- packager/media/formats/mp4/mp4_muxer.cc | 4 ++-- packager/media/formats/mp4/mp4_muxer.h | 4 ++-- packager/media/formats/mp4/multi_segment_segmenter.cc | 4 ++-- packager/media/formats/mp4/multi_segment_segmenter.h | 4 ++-- packager/media/formats/mp4/segmenter.cc | 4 ++-- packager/media/formats/mp4/segmenter.h | 4 ++-- packager/media/formats/mp4/single_segment_segmenter.cc | 4 ++-- packager/media/formats/mp4/single_segment_segmenter.h | 4 ++-- packager/media/formats/mp4/sync_sample_iterator.cc | 4 ++-- packager/media/formats/mp4/sync_sample_iterator.h | 4 ++-- packager/media/formats/mp4/sync_sample_iterator_unittest.cc | 4 ++-- packager/media/formats/mp4/track_run_iterator.cc | 4 ++-- packager/media/formats/mp4/track_run_iterator.h | 4 ++-- packager/media/formats/mp4/track_run_iterator_unittest.cc | 4 ++-- packager/media/formats/mp4/video_slice_header_parser.cc | 4 ++-- packager/media/formats/mp4/video_slice_header_parser.h | 4 ++-- .../media/formats/mp4/video_slice_header_parser_unittest.cc | 4 ++-- packager/media/formats/mpeg/adts_constants.cc | 4 ++-- packager/media/formats/mpeg/adts_constants.h | 4 ++-- packager/media/formats/webm/cluster_builder.cc | 4 ++-- packager/media/formats/webm/cluster_builder.h | 4 ++-- packager/media/formats/webm/encrypted_segmenter_unittest.cc | 4 ++-- packager/media/formats/webm/encryptor.cc | 4 ++-- packager/media/formats/webm/encryptor.h | 4 ++-- packager/media/formats/webm/mkv_writer.cc | 4 ++-- packager/media/formats/webm/mkv_writer.h | 4 ++-- packager/media/formats/webm/multi_segment_segmenter.cc | 4 ++-- packager/media/formats/webm/multi_segment_segmenter.h | 4 ++-- .../media/formats/webm/multi_segment_segmenter_unittest.cc | 4 ++-- packager/media/formats/webm/seek_head.cc | 4 ++-- packager/media/formats/webm/seek_head.h | 4 ++-- packager/media/formats/webm/segmenter.cc | 4 ++-- packager/media/formats/webm/segmenter.h | 4 ++-- packager/media/formats/webm/segmenter_test_base.cc | 4 ++-- packager/media/formats/webm/segmenter_test_base.h | 4 ++-- packager/media/formats/webm/single_segment_segmenter.cc | 4 ++-- packager/media/formats/webm/single_segment_segmenter.h | 4 ++-- .../media/formats/webm/single_segment_segmenter_unittest.cc | 4 ++-- packager/media/formats/webm/tracks_builder.cc | 4 ++-- packager/media/formats/webm/tracks_builder.h | 4 ++-- .../media/formats/webm/two_pass_single_segment_segmenter.cc | 4 ++-- .../media/formats/webm/two_pass_single_segment_segmenter.h | 4 ++-- packager/media/formats/webm/webm_audio_client.cc | 4 ++-- packager/media/formats/webm/webm_audio_client.h | 4 ++-- packager/media/formats/webm/webm_cluster_parser.cc | 4 ++-- packager/media/formats/webm/webm_cluster_parser.h | 4 ++-- packager/media/formats/webm/webm_cluster_parser_unittest.cc | 4 ++-- packager/media/formats/webm/webm_constants.cc | 4 ++-- packager/media/formats/webm/webm_constants.h | 4 ++-- packager/media/formats/webm/webm_content_encodings.cc | 4 ++-- packager/media/formats/webm/webm_content_encodings.h | 4 ++-- .../media/formats/webm/webm_content_encodings_client.cc | 4 ++-- packager/media/formats/webm/webm_content_encodings_client.h | 4 ++-- .../formats/webm/webm_content_encodings_client_unittest.cc | 4 ++-- packager/media/formats/webm/webm_crypto_helpers.cc | 4 ++-- packager/media/formats/webm/webm_crypto_helpers.h | 4 ++-- packager/media/formats/webm/webm_info_parser.cc | 4 ++-- packager/media/formats/webm/webm_info_parser.h | 4 ++-- packager/media/formats/webm/webm_media_parser.cc | 4 ++-- packager/media/formats/webm/webm_media_parser.h | 4 ++-- packager/media/formats/webm/webm_muxer.cc | 4 ++-- packager/media/formats/webm/webm_muxer.h | 4 ++-- packager/media/formats/webm/webm_parser.cc | 4 ++-- packager/media/formats/webm/webm_parser.h | 4 ++-- packager/media/formats/webm/webm_parser_unittest.cc | 4 ++-- packager/media/formats/webm/webm_tracks_parser.cc | 4 ++-- packager/media/formats/webm/webm_tracks_parser.h | 4 ++-- packager/media/formats/webm/webm_tracks_parser_unittest.cc | 4 ++-- packager/media/formats/webm/webm_video_client.cc | 4 ++-- packager/media/formats/webm/webm_video_client.h | 4 ++-- packager/media/formats/webm/webm_webvtt_parser.cc | 4 ++-- packager/media/formats/webm/webm_webvtt_parser.h | 4 ++-- packager/media/formats/webm/webm_webvtt_parser_unittest.cc | 4 ++-- packager/media/formats/webvtt/webvtt_media_parser.cc | 4 ++-- packager/media/formats/webvtt/webvtt_media_parser.h | 4 ++-- .../media/formats/webvtt/webvtt_media_parser_unittest.cc | 4 ++-- packager/media/formats/wvm/wvm_media_parser.cc | 4 ++-- packager/media/formats/wvm/wvm_media_parser.h | 4 ++-- packager/media/formats/wvm/wvm_media_parser_unittest.cc | 4 ++-- packager/media/test/packager_test.cc | 4 ++-- packager/media/test/test_data_util.cc | 4 ++-- packager/media/test/test_data_util.h | 4 ++-- packager/mpd/base/bandwidth_estimator_unittest.cc | 4 ++-- packager/mpd/base/content_protection_element.cc | 4 ++-- packager/mpd/base/content_protection_element.h | 4 ++-- packager/mpd/base/dash_iop_mpd_notifier.cc | 4 ++-- packager/mpd/base/dash_iop_mpd_notifier.h | 4 ++-- packager/mpd/base/dash_iop_mpd_notifier_unittest.cc | 4 ++-- packager/mpd/base/language_utils.cc | 4 ++-- packager/mpd/base/language_utils.h | 4 ++-- packager/mpd/base/media_info.proto | 2 +- packager/mpd/base/mock_mpd_builder.cc | 4 ++-- packager/mpd/base/mock_mpd_builder.h | 4 ++-- packager/mpd/base/mock_mpd_notifier.cc | 4 ++-- packager/mpd/base/mock_mpd_notifier.h | 4 ++-- packager/mpd/base/mpd_builder.cc | 4 ++-- packager/mpd/base/mpd_builder.h | 4 ++-- packager/mpd/base/mpd_builder_unittest.cc | 4 ++-- packager/mpd/base/mpd_notifier.h | 4 ++-- packager/mpd/base/mpd_notifier_util.cc | 4 ++-- packager/mpd/base/mpd_notifier_util.h | 4 ++-- packager/mpd/base/mpd_options.h | 4 ++-- packager/mpd/base/mpd_utils.cc | 4 ++-- packager/mpd/base/mpd_utils.h | 4 ++-- packager/mpd/base/segment_info.h | 4 ++-- packager/mpd/base/simple_mpd_notifier.cc | 4 ++-- packager/mpd/base/simple_mpd_notifier.h | 4 ++-- packager/mpd/base/simple_mpd_notifier_unittest.cc | 4 ++-- packager/mpd/base/xml/scoped_xml_ptr.h | 4 ++-- packager/mpd/base/xml/xml_node.cc | 4 ++-- packager/mpd/base/xml/xml_node.h | 4 ++-- packager/mpd/base/xml/xml_node_unittest.cc | 4 ++-- packager/mpd/test/mpd_builder_test_helper.cc | 4 ++-- packager/mpd/test/mpd_builder_test_helper.h | 4 ++-- packager/mpd/test/xml_compare.cc | 4 ++-- packager/mpd/test/xml_compare.h | 4 ++-- packager/mpd/util/mpd_writer.cc | 4 ++-- packager/mpd/util/mpd_writer.h | 4 ++-- packager/mpd/util/mpd_writer_unittest.cc | 4 ++-- packager/version/version.cc | 4 ++-- packager/version/version.h | 4 ++-- 410 files changed, 820 insertions(+), 820 deletions(-) diff --git a/packager/app/fixed_key_encryption_flags.cc b/packager/app/fixed_key_encryption_flags.cc index a176ce11eb..b84ae5f180 100644 --- a/packager/app/fixed_key_encryption_flags.cc +++ b/packager/app/fixed_key_encryption_flags.cc @@ -28,7 +28,7 @@ DEFINE_string(pssh, "will generate a v1 common PSSH box according to " "https://goo.gl/507mKp."); -namespace edash_packager { +namespace shaka { bool ValidateFixedCryptoFlags() { bool success = true; @@ -70,4 +70,4 @@ bool ValidateFixedCryptoFlags() { return success; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/fixed_key_encryption_flags.h b/packager/app/fixed_key_encryption_flags.h index ea3a6941aa..02afb3844c 100644 --- a/packager/app/fixed_key_encryption_flags.h +++ b/packager/app/fixed_key_encryption_flags.h @@ -18,12 +18,12 @@ DECLARE_string(key); DECLARE_string(iv); DECLARE_string(pssh); -namespace edash_packager { +namespace shaka { /// Validate fixed encryption/decryption flags. /// @return true on success, false otherwise. bool ValidateFixedCryptoFlags(); -} // namespace edash_packager +} // namespace shaka #endif // APP_FIXED_KEY_ENCRYPTION_FLAGS_H_ diff --git a/packager/app/libcrypto_threading.cc b/packager/app/libcrypto_threading.cc index 60dbdaa352..a0f0e663e3 100644 --- a/packager/app/libcrypto_threading.cc +++ b/packager/app/libcrypto_threading.cc @@ -15,7 +15,7 @@ #include "packager/base/synchronization/lock.h" #include "packager/base/threading/platform_thread.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -50,4 +50,4 @@ LibcryptoThreading::~LibcryptoThreading() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/libcrypto_threading.h b/packager/app/libcrypto_threading.h index 73a70702f5..a5c69bcdc2 100644 --- a/packager/app/libcrypto_threading.h +++ b/packager/app/libcrypto_threading.h @@ -9,7 +9,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { /// Convenience class which initializes and terminates libcrypto threading. @@ -23,6 +23,6 @@ class LibcryptoThreading { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // APP_LIBCRYPTO_THREADING_H_ diff --git a/packager/app/mpd_generator.cc b/packager/app/mpd_generator.cc index 7292c35b99..0ad464e249 100644 --- a/packager/app/mpd_generator.cc +++ b/packager/app/mpd_generator.cc @@ -14,7 +14,7 @@ #include "packager/mpd/util/mpd_writer.h" #include "packager/version/version.h" -namespace edash_packager { +namespace shaka { namespace { const char kUsage[] = "MPD generation driver program.\n" @@ -101,8 +101,8 @@ int MpdMain(int argc, char** argv) { } } // namespace -} // namespace edash_packager +} // namespace shaka int main(int argc, char** argv) { - return edash_packager::MpdMain(argc, argv); + return shaka::MpdMain(argc, argv); } diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index 456b83ab18..e770797de0 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -47,7 +47,7 @@ DEFINE_bool(use_fake_clock_for_muxer, "creation time and modification time in outputs are set to 0. " "Should only be used for testing."); -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -483,8 +483,8 @@ int PackagerMain(int argc, char** argv) { } } // namespace media -} // namespace edash_packager +} // namespace shaka int main(int argc, char** argv) { - return edash_packager::media::PackagerMain(argc, argv); + return shaka::media::PackagerMain(argc, argv); } diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc index 4645d93aa0..4696518da6 100644 --- a/packager/app/packager_util.cc +++ b/packager/app/packager_util.cc @@ -37,7 +37,7 @@ DEFINE_string(test_version_string, "--override_version_string is false. Should be used for testing " "only."); -namespace edash_packager { +namespace shaka { namespace media { void DumpStreamInfo(const std::vector& streams) { @@ -235,4 +235,4 @@ bool AddStreamToMuxer(const std::vector& streams, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/packager_util.h b/packager/app/packager_util.h index 9658fec977..cdd6fa7231 100644 --- a/packager/app/packager_util.h +++ b/packager/app/packager_util.h @@ -17,7 +17,7 @@ DECLARE_bool(dump_stream_info); -namespace edash_packager { +namespace shaka { struct MpdOptions; @@ -67,6 +67,6 @@ bool AddStreamToMuxer(const std::vector& streams, Muxer* muxer); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // APP_PACKAGER_UTIL_H_ diff --git a/packager/app/stream_descriptor.cc b/packager/app/stream_descriptor.cc index 80e19bf629..d420abca9d 100644 --- a/packager/app/stream_descriptor.cc +++ b/packager/app/stream_descriptor.cc @@ -12,7 +12,7 @@ #include "packager/base/strings/string_split.h" #include "packager/mpd/base/language_utils.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -149,4 +149,4 @@ bool InsertStreamDescriptor(const std::string& descriptor_string, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/stream_descriptor.h b/packager/app/stream_descriptor.h index 9a29772921..686ff97870 100644 --- a/packager/app/stream_descriptor.h +++ b/packager/app/stream_descriptor.h @@ -14,7 +14,7 @@ #include "packager/media/base/container_names.h" -namespace edash_packager { +namespace shaka { namespace media { /// Defines a single input/output stream, it's input source, output destination, @@ -54,6 +54,6 @@ bool InsertStreamDescriptor(const std::string& descriptor_string, StreamDescriptorList* descriptor_list); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // APP_STREAM_DESCRIPTOR_H_ diff --git a/packager/app/validate_flag.cc b/packager/app/validate_flag.cc index 09e3396535..c752f1de46 100644 --- a/packager/app/validate_flag.cc +++ b/packager/app/validate_flag.cc @@ -12,7 +12,7 @@ #include "packager/base/strings/stringprintf.h" -namespace edash_packager { +namespace shaka { bool ValidateFlag(const char* flag_name, const std::string& flag_value, @@ -37,4 +37,4 @@ void PrintError(const std::string& error_message) { fprintf(stderr, "ERROR: %s\n", error_message.c_str()); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/validate_flag.h b/packager/app/validate_flag.h index 5ccfa6a1dd..c1c0a390c3 100644 --- a/packager/app/validate_flag.h +++ b/packager/app/validate_flag.h @@ -11,7 +11,7 @@ #include -namespace edash_packager { +namespace shaka { /// Validate a flag against the given condition. /// @param flag_name is the name of the flag. @@ -33,6 +33,6 @@ bool ValidateFlag(const char* flag_name, /// @param error_message specifies the error message. void PrintError(const std::string& error_message); -} // namespace edash_packager +} // namespace shaka #endif // APP_VALIDATE_FLAG_H_ diff --git a/packager/app/widevine_encryption_flags.cc b/packager/app/widevine_encryption_flags.cc index d7edde94df..7c34a62baf 100644 --- a/packager/app/widevine_encryption_flags.cc +++ b/packager/app/widevine_encryption_flags.cc @@ -64,7 +64,7 @@ DEFINE_string(protection_scheme, "non-pattern-based protection schemes, i.e. 'cenc' for 'cens', " "'cbc1' for 'cbcs'."); -namespace edash_packager { +namespace shaka { bool ValidateWidevineCryptoFlags() { bool success = true; @@ -166,4 +166,4 @@ bool ValidateWidevineCryptoFlags() { return success; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/app/widevine_encryption_flags.h b/packager/app/widevine_encryption_flags.h index 19658cd8dc..acb78a61b8 100644 --- a/packager/app/widevine_encryption_flags.h +++ b/packager/app/widevine_encryption_flags.h @@ -25,12 +25,12 @@ DECLARE_string(rsa_signing_key_path); DECLARE_int32(crypto_period_duration); DECLARE_string(protection_scheme); -namespace edash_packager { +namespace shaka { /// Validate widevine encryption/decryption flags. /// @return true on success, false otherwise. bool ValidateWidevineCryptoFlags(); -} // namespace edash_packager +} // namespace shaka #endif // APP_WIDEVINE_ENCRYPTION_FLAGS_H_ diff --git a/packager/hls/base/hls_notifier.h b/packager/hls/base/hls_notifier.h index 3d97b0127f..00d7f812b9 100644 --- a/packager/hls/base/hls_notifier.h +++ b/packager/hls/base/hls_notifier.h @@ -12,7 +12,7 @@ #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace hls { // TODO(rkuroiwa): Consider merging this with MpdNotifier. @@ -84,5 +84,5 @@ class HlsNotifier { }; } // namespace hls -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_HLS_BASE_HLS_NOTIFIER_H_ diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc index ac2cecc577..07b1e26460 100644 --- a/packager/hls/base/master_playlist.cc +++ b/packager/hls/base/master_playlist.cc @@ -19,7 +19,7 @@ #include "packager/media/file/file.h" #include "packager/media/file/file_closer.h" -namespace edash_packager { +namespace shaka { namespace hls { MasterPlaylist::MasterPlaylist(const std::string& file_name) @@ -163,4 +163,4 @@ bool MasterPlaylist::WriteMasterPlaylist(const std::string& base_url, } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/master_playlist.h b/packager/hls/base/master_playlist.h index 60135d285c..8d41a371ae 100644 --- a/packager/hls/base/master_playlist.h +++ b/packager/hls/base/master_playlist.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace hls { class MediaPlaylist; @@ -63,6 +63,6 @@ class MasterPlaylist { }; } // namespace hls -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_HLS_BASE_MASTER_PLAYLIST_H_ diff --git a/packager/hls/base/master_playlist_unittest.cc b/packager/hls/base/master_playlist_unittest.cc index 56c994d481..ceff1074ba 100644 --- a/packager/hls/base/master_playlist_unittest.cc +++ b/packager/hls/base/master_playlist_unittest.cc @@ -14,7 +14,7 @@ #include "packager/hls/base/mock_media_playlist.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace hls { using ::testing::AtLeast; @@ -272,4 +272,4 @@ TEST_F(MasterPlaylistTest, WriteAllPlaylists) { } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc index bb73f6687a..28c58e5df0 100644 --- a/packager/hls/base/media_playlist.cc +++ b/packager/hls/base/media_playlist.cc @@ -13,7 +13,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace hls { namespace { @@ -337,4 +337,4 @@ bool MediaPlaylist::SetTargetDuration(uint32_t target_duration) { } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/media_playlist.h b/packager/hls/base/media_playlist.h index a54185d712..e81f9829c4 100644 --- a/packager/hls/base/media_playlist.h +++ b/packager/hls/base/media_playlist.h @@ -15,7 +15,7 @@ #include "packager/base/stl_util.h" #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace media { class File; @@ -181,6 +181,6 @@ class MediaPlaylist { }; } // namespace hls -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_HLS_BASE_MEDIA_PLAYLIST_H_ diff --git a/packager/hls/base/media_playlist_unittest.cc b/packager/hls/base/media_playlist_unittest.cc index 8f86f7ea01..ad894ba31b 100644 --- a/packager/hls/base/media_playlist_unittest.cc +++ b/packager/hls/base/media_playlist_unittest.cc @@ -10,7 +10,7 @@ #include "packager/media/file/file.h" #include "packager/hls/base/media_playlist.h" -namespace edash_packager { +namespace shaka { namespace hls { using ::testing::_; @@ -303,4 +303,4 @@ TEST_F(MediaPlaylistTest, RemoveOldestSegment) { } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/mock_media_playlist.cc b/packager/hls/base/mock_media_playlist.cc index f9e2b7ef59..ccc07da0a2 100644 --- a/packager/hls/base/mock_media_playlist.cc +++ b/packager/hls/base/mock_media_playlist.cc @@ -6,7 +6,7 @@ #include "packager/hls/base/mock_media_playlist.h" -namespace edash_packager { +namespace shaka { namespace hls { MockMediaPlaylist::MockMediaPlaylist(MediaPlaylistType type, @@ -17,4 +17,4 @@ MockMediaPlaylist::MockMediaPlaylist(MediaPlaylistType type, MockMediaPlaylist::~MockMediaPlaylist() {} } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/mock_media_playlist.h b/packager/hls/base/mock_media_playlist.h index 61abe2b75c..b0e8abc4ca 100644 --- a/packager/hls/base/mock_media_playlist.h +++ b/packager/hls/base/mock_media_playlist.h @@ -11,7 +11,7 @@ #include "packager/hls/base/media_playlist.h" -namespace edash_packager { +namespace shaka { namespace hls { class MockMediaPlaylist : public MediaPlaylist { @@ -43,6 +43,6 @@ class MockMediaPlaylist : public MediaPlaylist { }; } // namespace hls -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_HLS_BASE_MOCK_MEDIA_PLAYLIST_H_ diff --git a/packager/hls/base/simple_hls_notifier.cc b/packager/hls/base/simple_hls_notifier.cc index 326273de46..6406933184 100644 --- a/packager/hls/base/simple_hls_notifier.cc +++ b/packager/hls/base/simple_hls_notifier.cc @@ -13,7 +13,7 @@ #include "packager/hls/base/media_playlist.h" #include "packager/media/base/widevine_pssh_data.pb.h" -namespace edash_packager { +namespace shaka { namespace hls { namespace { @@ -173,4 +173,4 @@ bool SimpleHlsNotifier::Flush() { } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/hls/base/simple_hls_notifier.h b/packager/hls/base/simple_hls_notifier.h index 4e1be4723a..bd0217c59c 100644 --- a/packager/hls/base/simple_hls_notifier.h +++ b/packager/hls/base/simple_hls_notifier.h @@ -16,7 +16,7 @@ #include "packager/hls/base/master_playlist.h" #include "packager/hls/base/media_playlist.h" -namespace edash_packager { +namespace shaka { namespace hls { /// For testing. @@ -89,6 +89,6 @@ class SimpleHlsNotifier : public HlsNotifier { }; } // namespace hls -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_HLS_BASE_SIMPLE_HLS_NOTIFIER_H_ diff --git a/packager/hls/base/simple_hls_notifier_unittest.cc b/packager/hls/base/simple_hls_notifier_unittest.cc index ad60ac08bc..7ebc21f714 100644 --- a/packager/hls/base/simple_hls_notifier_unittest.cc +++ b/packager/hls/base/simple_hls_notifier_unittest.cc @@ -12,7 +12,7 @@ #include "packager/hls/base/simple_hls_notifier.h" #include "packager/media/base/widevine_pssh_data.pb.h" -namespace edash_packager { +namespace shaka { namespace hls { using ::testing::Return; @@ -369,4 +369,4 @@ TEST_F(SimpleHlsNotifierTest, Flush) { } } // namespace hls -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_cryptor.cc b/packager/media/base/aes_cryptor.cc index 8d7d242360..ac97e46d57 100644 --- a/packager/media/base/aes_cryptor.cc +++ b/packager/media/base/aes_cryptor.cc @@ -26,7 +26,7 @@ bool IsIvSizeValid(size_t iv_size) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { AesCryptor::AesCryptor(ConstantIvFlag constant_iv_flag) @@ -131,6 +131,6 @@ size_t AesCryptor::NumPaddingBytes(size_t size) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_cryptor.h b/packager/media/base/aes_cryptor.h index bc7d9a0ee9..2c4997f232 100644 --- a/packager/media/base/aes_cryptor.h +++ b/packager/media/base/aes_cryptor.h @@ -17,7 +17,7 @@ struct aes_key_st; typedef struct aes_key_st AES_KEY; -namespace edash_packager { +namespace shaka { namespace media { // AES cryptor interface. Inherited by various AES encryptor and decryptor @@ -132,7 +132,7 @@ class AesCryptor { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_BASE_AES_CRYPTOR_H_ diff --git a/packager/media/base/aes_cryptor_unittest.cc b/packager/media/base/aes_cryptor_unittest.cc index 1ad5b0a5b6..6df17a5df4 100644 --- a/packager/media/base/aes_cryptor_unittest.cc +++ b/packager/media/base/aes_cryptor_unittest.cc @@ -131,7 +131,7 @@ const uint8_t kInvalidIv[] = {0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, } // namespace -namespace edash_packager { +namespace shaka { namespace media { class AesCtrEncryptorTest : public testing::Test { @@ -620,4 +620,4 @@ INSTANTIATE_TEST_CASE_P(CbcTestCases, ::testing::ValuesIn(kCbcTestCases)); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_decryptor.cc b/packager/media/base/aes_decryptor.cc index db815aee63..514a29e808 100644 --- a/packager/media/base/aes_decryptor.cc +++ b/packager/media/base/aes_decryptor.cc @@ -19,7 +19,7 @@ bool IsKeySizeValidForAes(size_t key_size) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { AesCbcDecryptor::AesCbcDecryptor(CbcPaddingScheme padding_scheme) @@ -159,4 +159,4 @@ void AesCbcDecryptor::SetIvInternal() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_decryptor.h b/packager/media/base/aes_decryptor.h index 0d717a1b55..fc191177f3 100644 --- a/packager/media/base/aes_decryptor.h +++ b/packager/media/base/aes_decryptor.h @@ -15,7 +15,7 @@ #include "packager/media/base/aes_cryptor.h" #include "packager/media/base/aes_encryptor.h" -namespace edash_packager { +namespace shaka { namespace media { /// For AES-CTR, encryption and decryption are identical. @@ -63,6 +63,6 @@ class AesCbcDecryptor : public AesCryptor { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_BASE_AES_DECRYPTOR_H_ diff --git a/packager/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc index eb45906f13..a9f0578cc4 100644 --- a/packager/media/base/aes_encryptor.cc +++ b/packager/media/base/aes_encryptor.cc @@ -29,7 +29,7 @@ bool IsKeySizeValidForAes(size_t key_size) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { AesEncryptor::AesEncryptor(ConstantIvFlag constant_iv_flag) @@ -196,4 +196,4 @@ size_t AesCbcEncryptor::NumPaddingBytes(size_t size) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_encryptor.h b/packager/media/base/aes_encryptor.h index 6393bc1943..0f94d05fbd 100644 --- a/packager/media/base/aes_encryptor.h +++ b/packager/media/base/aes_encryptor.h @@ -16,7 +16,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/aes_cryptor.h" -namespace edash_packager { +namespace shaka { namespace media { class AesEncryptor : public AesCryptor { @@ -111,6 +111,6 @@ class AesCbcEncryptor : public AesEncryptor { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_AES_ENCRYPTOR_H_ diff --git a/packager/media/base/aes_pattern_cryptor.cc b/packager/media/base/aes_pattern_cryptor.cc index cb7ed66e74..8de98ede90 100644 --- a/packager/media/base/aes_pattern_cryptor.cc +++ b/packager/media/base/aes_pattern_cryptor.cc @@ -10,7 +10,7 @@ #include #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { AesPatternCryptor::AesPatternCryptor(uint8_t crypt_byte_block, @@ -81,4 +81,4 @@ bool AesPatternCryptor::NeedEncrypt(size_t input_size, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_pattern_cryptor.h b/packager/media/base/aes_pattern_cryptor.h index a306417621..7c4d364a38 100644 --- a/packager/media/base/aes_pattern_cryptor.h +++ b/packager/media/base/aes_pattern_cryptor.h @@ -9,7 +9,7 @@ #include "packager/base/macros.h" #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { /// Implements pattern-based encryption/decryption. @@ -79,4 +79,4 @@ class AesPatternCryptor : public AesCryptor { }; } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/aes_pattern_cryptor_unittest.cc b/packager/media/base/aes_pattern_cryptor_unittest.cc index efdfbc84fb..dc6dbfb423 100644 --- a/packager/media/base/aes_pattern_cryptor_unittest.cc +++ b/packager/media/base/aes_pattern_cryptor_unittest.cc @@ -19,7 +19,7 @@ const uint8_t kCryptByteBlock = 2u; const uint8_t kSkipByteBlock = 1u; } // namespace -namespace edash_packager { +namespace shaka { namespace media { class MockAesCryptor : public AesCryptor { @@ -220,4 +220,4 @@ TEST(SampleAesPatternCryptor, MoreThan16Bytes) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc index b6d3940256..5b25437e53 100644 --- a/packager/media/base/audio_stream_info.cc +++ b/packager/media/base/audio_stream_info.cc @@ -13,7 +13,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/media/base/limits.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -141,4 +141,4 @@ std::string AudioStreamInfo::GetCodecString(AudioCodec codec, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/audio_stream_info.h b/packager/media/base/audio_stream_info.h index f8aef96eee..17646cad61 100644 --- a/packager/media/base/audio_stream_info.h +++ b/packager/media/base/audio_stream_info.h @@ -11,7 +11,7 @@ #include "packager/media/base/stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { enum AudioCodec { @@ -99,6 +99,6 @@ class AudioStreamInfo : public StreamInfo { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_AUDIO_STREAM_INFO_H_ diff --git a/packager/media/base/audio_timestamp_helper.cc b/packager/media/base/audio_timestamp_helper.cc index e8ce03ce41..97450ee94a 100644 --- a/packager/media/base/audio_timestamp_helper.cc +++ b/packager/media/base/audio_timestamp_helper.cc @@ -7,7 +7,7 @@ #include "packager/base/logging.h" #include "packager/media/base/timestamp.h" -namespace edash_packager { +namespace shaka { namespace media { AudioTimestampHelper::AudioTimestampHelper(uint32_t timescale, @@ -72,4 +72,4 @@ int64_t AudioTimestampHelper::ComputeTimestamp(int64_t frame_count) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h index e709aaf202..ad7abb6ab2 100644 --- a/packager/media/base/audio_timestamp_helper.h +++ b/packager/media/base/audio_timestamp_helper.h @@ -9,7 +9,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { // Generates timestamps for a sequence of audio sample frames. This class should @@ -71,6 +71,6 @@ class AudioTimestampHelper { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/base/audio_timestamp_helper_unittest.cc b/packager/media/base/audio_timestamp_helper_unittest.cc index 46036f5ca8..c20a572d54 100644 --- a/packager/media/base/audio_timestamp_helper_unittest.cc +++ b/packager/media/base/audio_timestamp_helper_unittest.cc @@ -7,7 +7,7 @@ #include "packager/media/base/audio_timestamp_helper.h" #include "packager/media/base/timestamp.h" -namespace edash_packager { +namespace shaka { namespace media { static const uint32_t kDefaultSampleRate = 44100; @@ -122,4 +122,4 @@ TEST_F(AudioTimestampHelperTest, GetFramesToTarget) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/bit_reader.cc b/packager/media/base/bit_reader.cc index 517f830474..9fa7cb2a67 100644 --- a/packager/media/base/bit_reader.cc +++ b/packager/media/base/bit_reader.cc @@ -6,7 +6,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { BitReader::BitReader(const uint8_t* data, off_t size) @@ -103,4 +103,4 @@ void BitReader::UpdateCurrByte() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/bit_reader.h b/packager/media/base/bit_reader.h index 92e06bbd37..33ad8fa623 100644 --- a/packager/media/base/bit_reader.h +++ b/packager/media/base/bit_reader.h @@ -10,7 +10,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { /// A class to read bit streams. @@ -111,6 +111,6 @@ class BitReader { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_BIT_READER_H_ diff --git a/packager/media/base/bit_reader_unittest.cc b/packager/media/base/bit_reader_unittest.cc index e79ea26807..377d7a198e 100644 --- a/packager/media/base/bit_reader_unittest.cc +++ b/packager/media/base/bit_reader_unittest.cc @@ -6,7 +6,7 @@ #include "packager/media/base/bit_reader.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(BitReaderTest, NormalOperationTest) { @@ -89,4 +89,4 @@ TEST(BitReaderTest, SkipBitsConditionalTest) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/buffer_reader.cc b/packager/media/base/buffer_reader.cc index 4e593550af..456c67d6dd 100644 --- a/packager/media/base/buffer_reader.cc +++ b/packager/media/base/buffer_reader.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { bool BufferReader::Read1(uint8_t* v) { @@ -99,4 +99,4 @@ bool BufferReader::ReadNBytes(T* v, size_t num_bytes) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h index 46b615780a..16d3b1abca 100644 --- a/packager/media/base/buffer_reader.h +++ b/packager/media/base/buffer_reader.h @@ -15,7 +15,7 @@ #include "packager/base/compiler_specific.h" #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { /// A simple buffer reader implementation, which reads data of various types @@ -80,6 +80,6 @@ class BufferReader { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_BUFFER_READER_H_ diff --git a/packager/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc index 438e577128..d5ad554ca2 100644 --- a/packager/media/base/buffer_writer.cc +++ b/packager/media/base/buffer_writer.cc @@ -10,7 +10,7 @@ #include "packager/base/sys_byteorder.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { BufferWriter::BufferWriter() { @@ -88,4 +88,4 @@ void BufferWriter::AppendInternal(T v) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h index 8ae419ea82..7dab0c25da 100644 --- a/packager/media/base/buffer_writer.h +++ b/packager/media/base/buffer_writer.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { class File; @@ -75,6 +75,6 @@ class BufferWriter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_BUFFER_WRITER_H_ diff --git a/packager/media/base/buffer_writer_unittest.cc b/packager/media/base/buffer_writer_unittest.cc index 0b2386f4b3..b13528a83a 100644 --- a/packager/media/base/buffer_writer_unittest.cc +++ b/packager/media/base/buffer_writer_unittest.cc @@ -26,7 +26,7 @@ const int64_t kint64 = -10000000000LL; const uint8_t kuint8Array[] = {10, 1, 100, 5, 3, 60}; } // namespace -namespace edash_packager { +namespace shaka { namespace media { class BufferWriterTest : public testing::Test { @@ -185,4 +185,4 @@ TEST_F(BufferWriterTest, WriteToFile) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/byte_queue.cc b/packager/media/base/byte_queue.cc index 1a6c83a195..9de7c5f4f6 100644 --- a/packager/media/base/byte_queue.cc +++ b/packager/media/base/byte_queue.cc @@ -6,7 +6,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { // Default starting size for the queue. @@ -85,4 +85,4 @@ uint8_t* ByteQueue::front() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/byte_queue.h b/packager/media/base/byte_queue.h index 8f69c3dd3e..70d6edba4c 100644 --- a/packager/media/base/byte_queue.h +++ b/packager/media/base/byte_queue.h @@ -9,7 +9,7 @@ #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { /// Represents a queue of bytes. @@ -55,6 +55,6 @@ class ByteQueue { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_BYTE_QUEUE_H_ diff --git a/packager/media/base/closure_thread.cc b/packager/media/base/closure_thread.cc index c61de450a4..71f4f24633 100644 --- a/packager/media/base/closure_thread.cc +++ b/packager/media/base/closure_thread.cc @@ -6,7 +6,7 @@ #include "packager/media/base/closure_thread.h" -namespace edash_packager { +namespace shaka { namespace media { ClosureThread::ClosureThread( @@ -22,4 +22,4 @@ ClosureThread::~ClosureThread() { void ClosureThread::Run() { task_.Run(); } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/closure_thread.h b/packager/media/base/closure_thread.h index 3a11964dc2..755637b1ad 100644 --- a/packager/media/base/closure_thread.h +++ b/packager/media/base/closure_thread.h @@ -10,7 +10,7 @@ #include "packager/base/callback.h" #include "packager/base/threading/simple_thread.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class for creating a thread which invokes a closure. @@ -44,6 +44,6 @@ class ClosureThread : public base::SimpleThread { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_CLOSURE_THREAD_H_ diff --git a/packager/media/base/closure_thread_unittest.cc b/packager/media/base/closure_thread_unittest.cc index d8b1127415..28e1c6d892 100644 --- a/packager/media/base/closure_thread_unittest.cc +++ b/packager/media/base/closure_thread_unittest.cc @@ -28,7 +28,7 @@ class MockOperation { } // namespace -namespace edash_packager { +namespace shaka { namespace media { class ClosureThreadTest : public ::testing::Test { @@ -121,4 +121,4 @@ TEST_F(ClosureThreadTest, DISABLED_NotStarted) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc index 8fd38c5d5c..3d32ed3384 100644 --- a/packager/media/base/container_names.cc +++ b/packager/media/base/container_names.cc @@ -16,7 +16,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/mpd/base/xml/scoped_xml_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { #define TAG(a, b, c, d) \ @@ -1751,4 +1751,4 @@ MediaContainerName DetermineContainerFromFileName( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/container_names.h b/packager/media/base/container_names.h index 8895e3ab2e..0175804eb9 100644 --- a/packager/media/base/container_names.h +++ b/packager/media/base/container_names.h @@ -9,7 +9,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { /// Container formats supported by this utility function. New formats should be @@ -71,6 +71,6 @@ MediaContainerName DetermineContainerFromFormatName( MediaContainerName DetermineContainerFromFileName(const std::string& file_name); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_CONTAINER_NAMES_H_ diff --git a/packager/media/base/container_names_unittest.cc b/packager/media/base/container_names_unittest.cc index 1506aa1002..7d1a63d939 100644 --- a/packager/media/base/container_names_unittest.cc +++ b/packager/media/base/container_names_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/base/container_names.h" #include "packager/media/test/test_data_util.h" -namespace edash_packager { +namespace shaka { namespace media { // Using a macros to simplify tests. Since EXPECT_EQ outputs the second argument @@ -283,4 +283,4 @@ TEST(ContainerNamesTest, FileCheckUNKNOWN) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/decrypt_config.cc b/packager/media/base/decrypt_config.cc index c2c7f3e7b8..e56febfc5a 100644 --- a/packager/media/base/decrypt_config.cc +++ b/packager/media/base/decrypt_config.cc @@ -6,7 +6,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { DecryptConfig::DecryptConfig(const std::vector& key_id, @@ -32,4 +32,4 @@ DecryptConfig::DecryptConfig(const std::vector& key_id, DecryptConfig::~DecryptConfig() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h index b1a3ed8600..b0ad28b0c2 100644 --- a/packager/media/base/decrypt_config.h +++ b/packager/media/base/decrypt_config.h @@ -13,7 +13,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/fourccs.h" -namespace edash_packager { +namespace shaka { namespace media { /// The Common Encryption spec provides for subsample encryption, where portions @@ -99,6 +99,6 @@ class DecryptConfig { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_DECRYPT_CONFIG_H_ diff --git a/packager/media/base/decryptor_source.cc b/packager/media/base/decryptor_source.cc index 1b0b80439b..09235c686b 100644 --- a/packager/media/base/decryptor_source.cc +++ b/packager/media/base/decryptor_source.cc @@ -11,7 +11,7 @@ #include "packager/media/base/aes_decryptor.h" #include "packager/media/base/aes_pattern_cryptor.h" -namespace edash_packager { +namespace shaka { namespace media { DecryptorSource::DecryptorSource(KeySource* key_source) @@ -114,4 +114,4 @@ bool DecryptorSource::DecryptSampleBuffer(const DecryptConfig* decrypt_config, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/decryptor_source.h b/packager/media/base/decryptor_source.h index 4bde1355b5..7491eed8fa 100644 --- a/packager/media/base/decryptor_source.h +++ b/packager/media/base/decryptor_source.h @@ -14,7 +14,7 @@ #include "packager/media/base/decrypt_config.h" #include "packager/media/base/key_source.h" -namespace edash_packager { +namespace shaka { namespace media { /// DecryptorSource wraps KeySource and is responsible for decryptor management. @@ -35,6 +35,6 @@ class DecryptorSource { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_DECRYPTOR_SOURCE_H_ diff --git a/packager/media/base/decryptor_source_unittest.cc b/packager/media/base/decryptor_source_unittest.cc index a5fe29b627..e0eba2d55b 100644 --- a/packager/media/base/decryptor_source_unittest.cc +++ b/packager/media/base/decryptor_source_unittest.cc @@ -18,7 +18,7 @@ using ::testing::StrictMock; using ::testing::Mock; using ::testing::_; -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -170,4 +170,4 @@ TEST_F(DecryptorSourceTest, DecryptFailedIfGetKeyFailed) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/demuxer.cc b/packager/media/base/demuxer.cc index 1514076dc0..62f866bd6c 100644 --- a/packager/media/base/demuxer.cc +++ b/packager/media/base/demuxer.cc @@ -31,7 +31,7 @@ const size_t kBufSize = 0x200000; // 2MB const size_t kQueuedSamplesLimit = 10000; } -namespace edash_packager { +namespace shaka { namespace media { Demuxer::Demuxer(const std::string& file_name) @@ -234,4 +234,4 @@ void Demuxer::Cancel() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/demuxer.h b/packager/media/base/demuxer.h index 1f57ae56c7..01696d181e 100644 --- a/packager/media/base/demuxer.h +++ b/packager/media/base/demuxer.h @@ -16,7 +16,7 @@ #include "packager/media/base/container_names.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { class Decryptor; @@ -107,6 +107,6 @@ class Demuxer { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_DEMUXER_H_ diff --git a/packager/media/base/fixed_key_source.cc b/packager/media/base/fixed_key_source.cc index 4edd0133d5..5a2e064d44 100644 --- a/packager/media/base/fixed_key_source.cc +++ b/packager/media/base/fixed_key_source.cc @@ -9,7 +9,7 @@ #include "packager/base/logging.h" #include "packager/base/strings/string_number_conversions.h" -namespace edash_packager { +namespace shaka { namespace media { FixedKeySource::~FixedKeySource() {} @@ -141,4 +141,4 @@ FixedKeySource::FixedKeySource(scoped_ptr key) : encryption_key_(key.Pass()) {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/fixed_key_source.h b/packager/media/base/fixed_key_source.h index be7ff7cdb5..627ffedde2 100644 --- a/packager/media/base/fixed_key_source.h +++ b/packager/media/base/fixed_key_source.h @@ -13,7 +13,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/key_source.h" -namespace edash_packager { +namespace shaka { namespace media { // Common SystemID defined by EME, which requires Key System implementations @@ -70,6 +70,6 @@ class FixedKeySource : public KeySource { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_FIXED_KEY_SOURCE_H_ diff --git a/packager/media/base/fixed_key_source_unittest.cc b/packager/media/base/fixed_key_source_unittest.cc index dfc0fffa6e..7e633171ef 100644 --- a/packager/media/base/fixed_key_source_unittest.cc +++ b/packager/media/base/fixed_key_source_unittest.cc @@ -18,7 +18,7 @@ EXPECT_EQ(decoded_, (actual)); \ } while (false) -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -96,4 +96,4 @@ TEST(FixedKeySourceTest, CreateFromHexStrings_Failure) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/fourccs.h b/packager/media/base/fourccs.h index 15febbc25f..4f4c94b67a 100644 --- a/packager/media/base/fourccs.h +++ b/packager/media/base/fourccs.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { enum FourCC : uint32_t { @@ -153,6 +153,6 @@ const inline std::string FourCCToString(FourCC fourcc) { } } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_BASE_FOURCCS_H_ diff --git a/packager/media/base/http_key_fetcher.cc b/packager/media/base/http_key_fetcher.cc index 22f29f7333..49f55b587d 100644 --- a/packager/media/base/http_key_fetcher.cc +++ b/packager/media/base/http_key_fetcher.cc @@ -12,7 +12,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/base/synchronization/lock.h" -namespace edash_packager { +namespace shaka { namespace { const char kUserAgentString[] = "shaka-packager-http_fetcher/1.0"; @@ -140,4 +140,4 @@ Status HttpKeyFetcher::FetchInternal(HttpMethod method, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/http_key_fetcher.h b/packager/media/base/http_key_fetcher.h index 6f6587480c..d312ad3bd5 100644 --- a/packager/media/base/http_key_fetcher.h +++ b/packager/media/base/http_key_fetcher.h @@ -15,7 +15,7 @@ #include "packager/media/base/key_fetcher.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { /// A KeyFetcher implementation that retrieves keys over HTTP(s). @@ -70,6 +70,6 @@ class HttpKeyFetcher : public KeyFetcher { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_HTTP_KEY_FETCHER_H_ diff --git a/packager/media/base/http_key_fetcher_unittest.cc b/packager/media/base/http_key_fetcher_unittest.cc index 6307794c32..6e4296a608 100644 --- a/packager/media/base/http_key_fetcher_unittest.cc +++ b/packager/media/base/http_key_fetcher_unittest.cc @@ -24,7 +24,7 @@ const char kExpectedPostResponse[] = const char kDelayTwoSecs[] = "delay=2"; // This causes host to delay 2 seconds. } // namespace -namespace edash_packager { +namespace shaka { namespace media { static void CheckHttpGet(const std::string& url, @@ -96,5 +96,5 @@ TEST(DISABLED_HttpKeyFetcherTest, BigTimeout) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/key_fetcher.cc b/packager/media/base/key_fetcher.cc index 37fbf2a40c..e55d96bea7 100644 --- a/packager/media/base/key_fetcher.cc +++ b/packager/media/base/key_fetcher.cc @@ -6,11 +6,11 @@ #include "packager/media/base/key_fetcher.h" -namespace edash_packager { +namespace shaka { namespace media { KeyFetcher::KeyFetcher() {} KeyFetcher::~KeyFetcher() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/key_fetcher.h b/packager/media/base/key_fetcher.h index 10dd9bec5a..4705062f63 100644 --- a/packager/media/base/key_fetcher.h +++ b/packager/media/base/key_fetcher.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { /// Base class for fetching keys from the license service. @@ -34,7 +34,7 @@ class KeyFetcher { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_KEY_FETCHER_H_ diff --git a/packager/media/base/key_source.cc b/packager/media/base/key_source.cc index f6dda92fee..474103bf57 100644 --- a/packager/media/base/key_source.cc +++ b/packager/media/base/key_source.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { EncryptionKey::EncryptionKey() {} @@ -47,4 +47,4 @@ std::string KeySource::TrackTypeToString(TrackType track_type) { KeySource::KeySource() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/key_source.h b/packager/media/base/key_source.h index f483dfb634..5d41f2c5c8 100644 --- a/packager/media/base/key_source.h +++ b/packager/media/base/key_source.h @@ -14,7 +14,7 @@ #include "packager/media/base/protection_system_specific_info.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { struct EncryptionKey { @@ -96,6 +96,6 @@ class KeySource { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_KEY_SOURCE_H_ diff --git a/packager/media/base/limits.h b/packager/media/base/limits.h index e090a8f743..ab700c1186 100644 --- a/packager/media/base/limits.h +++ b/packager/media/base/limits.h @@ -7,7 +7,7 @@ #ifndef MEDIA_BASE_LIMITS_H_ #define MEDIA_BASE_LIMITS_H_ -namespace edash_packager { +namespace shaka { namespace media { namespace limits { @@ -46,6 +46,6 @@ enum { } // namespace limits } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_LIMITS_H_ diff --git a/packager/media/base/media_parser.h b/packager/media/base/media_parser.h index 846316a731..72bf581dc2 100644 --- a/packager/media/base/media_parser.h +++ b/packager/media/base/media_parser.h @@ -16,7 +16,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/container_names.h" -namespace edash_packager { +namespace shaka { namespace media { class KeySource; @@ -68,6 +68,6 @@ class MediaParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MEDIA_PARSER_H_ diff --git a/packager/media/base/media_sample.cc b/packager/media/base/media_sample.cc index 119115f5ff..f9240c27b5 100644 --- a/packager/media/base/media_sample.cc +++ b/packager/media/base/media_sample.cc @@ -11,7 +11,7 @@ #include "packager/base/logging.h" #include "packager/base/strings/stringprintf.h" -namespace edash_packager { +namespace shaka { namespace media { MediaSample::MediaSample(const uint8_t* data, @@ -96,4 +96,4 @@ std::string MediaSample::ToString() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h index 66f33606c2..791c50dd75 100644 --- a/packager/media/base/media_sample.h +++ b/packager/media/base/media_sample.h @@ -15,7 +15,7 @@ #include "packager/base/memory/ref_counted.h" #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class to hold a media sample. @@ -185,6 +185,6 @@ class MediaSample : public base::RefCountedThreadSafe { typedef std::deque > BufferQueue; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MEDIA_SAMPLE_H_ diff --git a/packager/media/base/media_stream.cc b/packager/media/base/media_stream.cc index f77f9e60bb..3d2ff720f8 100644 --- a/packager/media/base/media_stream.cc +++ b/packager/media/base/media_stream.cc @@ -13,7 +13,7 @@ #include "packager/media/base/muxer.h" #include "packager/media/base/stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { MediaStream::MediaStream(scoped_refptr info, Demuxer* demuxer) @@ -106,4 +106,4 @@ std::string MediaStream::ToString() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/media_stream.h b/packager/media/base/media_stream.h index ce10c42f05..1be48816ef 100644 --- a/packager/media/base/media_stream.h +++ b/packager/media/base/media_stream.h @@ -13,7 +13,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { class Demuxer; @@ -75,6 +75,6 @@ class MediaStream { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MEDIA_STREAM_H_ diff --git a/packager/media/base/muxer.cc b/packager/media/base/muxer.cc index e765f7e143..162201cb5f 100644 --- a/packager/media/base/muxer.cc +++ b/packager/media/base/muxer.cc @@ -10,7 +10,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/base/media_stream.h" -namespace edash_packager { +namespace shaka { namespace media { Muxer::Muxer(const MuxerOptions& options) @@ -115,4 +115,4 @@ Status Muxer::AddSample(const MediaStream* stream, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/muxer.h b/packager/media/base/muxer.h index 9f34201260..613f945a98 100644 --- a/packager/media/base/muxer.h +++ b/packager/media/base/muxer.h @@ -20,7 +20,7 @@ #include "packager/media/event/muxer_listener.h" #include "packager/media/event/progress_listener.h" -namespace edash_packager { +namespace shaka { namespace media { class KeySource; @@ -134,6 +134,6 @@ class Muxer { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MUXER_H_ diff --git a/packager/media/base/muxer_options.cc b/packager/media/base/muxer_options.cc index ed589780b2..363fd468ba 100644 --- a/packager/media/base/muxer_options.cc +++ b/packager/media/base/muxer_options.cc @@ -7,7 +7,7 @@ #include "packager/media/base/muxer_options.h" #include "packager/version/version.h" -namespace edash_packager { +namespace shaka { namespace media { MuxerOptions::MuxerOptions() @@ -22,4 +22,4 @@ MuxerOptions::MuxerOptions() MuxerOptions::~MuxerOptions() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/muxer_options.h b/packager/media/base/muxer_options.h index 85f9af0fb4..b7c7c42bc6 100644 --- a/packager/media/base/muxer_options.h +++ b/packager/media/base/muxer_options.h @@ -11,7 +11,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { /// This structure contains the list of configuration options for Muxer. @@ -83,6 +83,6 @@ struct MuxerOptions { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MUXER_OPTIONS_H_ diff --git a/packager/media/base/muxer_util.cc b/packager/media/base/muxer_util.cc index dcdd57423c..a6145cd7ee 100644 --- a/packager/media/base/muxer_util.cc +++ b/packager/media/base/muxer_util.cc @@ -17,7 +17,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/media/base/video_stream_info.h" -namespace edash_packager { +namespace shaka { namespace { bool ValidateFormatTag(const std::string& format_tag) { DCHECK(!format_tag.empty()); @@ -171,4 +171,4 @@ KeySource::TrackType GetTrackTypeForEncryption(const StreamInfo& stream_info, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/muxer_util.h b/packager/media/base/muxer_util.h index bbe5a7d363..a9b59cd598 100644 --- a/packager/media/base/muxer_util.h +++ b/packager/media/base/muxer_util.h @@ -15,7 +15,7 @@ #include "packager/media/base/key_source.h" -namespace edash_packager { +namespace shaka { namespace media { class StreamInfo; @@ -48,6 +48,6 @@ KeySource::TrackType GetTrackTypeForEncryption(const StreamInfo& stream_info, uint32_t max_sd_pixels); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_MUXER_UTIL_H_ diff --git a/packager/media/base/muxer_util_unittest.cc b/packager/media/base/muxer_util_unittest.cc index e886529007..152396d3d7 100644 --- a/packager/media/base/muxer_util_unittest.cc +++ b/packager/media/base/muxer_util_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/base/muxer_util.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(MuxerUtilTest, ValidateSegmentTemplate) { @@ -154,4 +154,4 @@ TEST(MuxerUtilTest, GetSegmentNameLargeTime) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/network_util.cc b/packager/media/base/network_util.cc index b1a1320f6c..06e7a5a27a 100644 --- a/packager/media/base/network_util.cc +++ b/packager/media/base/network_util.cc @@ -4,7 +4,7 @@ #include "packager/media/base/network_util.h" -namespace edash_packager { +namespace shaka { namespace media { uint32_t ntohlFromBuffer(const unsigned char* buf) { @@ -28,5 +28,5 @@ uint64_t ntohllFromBuffer(const unsigned char* buf) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/network_util.h b/packager/media/base/network_util.h index cf96243b2b..7028f0d033 100644 --- a/packager/media/base/network_util.h +++ b/packager/media/base/network_util.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { uint32_t ntohlFromBuffer(const unsigned char* buf); @@ -15,6 +15,6 @@ uint16_t ntohsFromBuffer(const unsigned char* buf); uint64_t ntohllFromBuffer(const unsigned char* buf); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_NETWORK_UTIL_H_ diff --git a/packager/media/base/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc index 96047ac90b..5ce38582e3 100644 --- a/packager/media/base/offset_byte_queue.cc +++ b/packager/media/base/offset_byte_queue.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { OffsetByteQueue::OffsetByteQueue() : buf_(NULL), size_(0), head_(0) {} @@ -63,4 +63,4 @@ void OffsetByteQueue::Sync() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h index 47fea1f4ea..3e848b9c77 100644 --- a/packager/media/base/offset_byte_queue.h +++ b/packager/media/base/offset_byte_queue.h @@ -9,7 +9,7 @@ #include "packager/media/base/byte_queue.h" -namespace edash_packager { +namespace shaka { namespace media { /// Wrapper around ByteQueue, which encapsulates the notion of a @@ -67,6 +67,6 @@ class OffsetByteQueue { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_OFFSET_BYTE_QUEUE_H_ diff --git a/packager/media/base/offset_byte_queue_unittest.cc b/packager/media/base/offset_byte_queue_unittest.cc index bd04db4a20..ab4c511c97 100644 --- a/packager/media/base/offset_byte_queue_unittest.cc +++ b/packager/media/base/offset_byte_queue_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/offset_byte_queue.h" -namespace edash_packager { +namespace shaka { namespace media { class OffsetByteQueueTest : public testing::Test { @@ -91,4 +91,4 @@ TEST_F(OffsetByteQueueTest, Trim) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/producer_consumer_queue.h b/packager/media/base/producer_consumer_queue.h index 4910eed49b..9e07f785f1 100644 --- a/packager/media/base/producer_consumer_queue.h +++ b/packager/media/base/producer_consumer_queue.h @@ -15,7 +15,7 @@ #include "packager/base/timer/elapsed_timer.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { static const size_t kUnlimitedCapacity = 0u; @@ -315,6 +315,6 @@ void ProducerConsumerQueue::SlideHeadOnCenter(size_t pos) { } } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_ diff --git a/packager/media/base/producer_consumer_queue_unittest.cc b/packager/media/base/producer_consumer_queue_unittest.cc index f30a15673a..029d133e2e 100644 --- a/packager/media/base/producer_consumer_queue_unittest.cc +++ b/packager/media/base/producer_consumer_queue_unittest.cc @@ -12,7 +12,7 @@ #include "packager/media/base/producer_consumer_queue.h" #include "packager/media/base/test/status_test_util.h" -namespace edash_packager { +namespace shaka { namespace { const size_t kCapacity = 10u; const int64_t kTimeout = 100; // 0.1s. @@ -364,4 +364,4 @@ INSTANTIATE_TEST_CASE_P(Operations, ::testing::Values(kPush, kPop, kPeek)); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/protection_system_specific_info.cc b/packager/media/base/protection_system_specific_info.cc index 76215aedc4..26bd5d2ca8 100644 --- a/packager/media/base/protection_system_specific_info.cc +++ b/packager/media/base/protection_system_specific_info.cc @@ -10,7 +10,7 @@ #include "packager/media/base/fourccs.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -116,4 +116,4 @@ std::vector ProtectionSystemSpecificInfo::CreateBox() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/protection_system_specific_info.h b/packager/media/base/protection_system_specific_info.h index ab734341c9..170cccff6a 100644 --- a/packager/media/base/protection_system_specific_info.h +++ b/packager/media/base/protection_system_specific_info.h @@ -13,7 +13,7 @@ #include "packager/base/logging.h" #include "packager/media/base/buffer_reader.h" -namespace edash_packager { +namespace shaka { namespace media { class ProtectionSystemSpecificInfo { @@ -69,7 +69,7 @@ class ProtectionSystemSpecificInfo { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_PSSH_H_ diff --git a/packager/media/base/protection_system_specific_info_unittest.cc b/packager/media/base/protection_system_specific_info_unittest.cc index a47811acfb..efa5e88483 100644 --- a/packager/media/base/protection_system_specific_info_unittest.cc +++ b/packager/media/base/protection_system_specific_info_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/macros.h" #include "packager/media/base/protection_system_specific_info.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -137,4 +137,4 @@ TEST_F(PsshTest, CreateBox_MakesV1Boxes) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/request_signer.cc b/packager/media/base/request_signer.cc index 7b050f72ef..9ebd90fe5a 100644 --- a/packager/media/base/request_signer.cc +++ b/packager/media/base/request_signer.cc @@ -12,7 +12,7 @@ #include "packager/media/base/aes_encryptor.h" #include "packager/media/base/rsa_key.h" -namespace edash_packager { +namespace shaka { namespace media { RequestSigner::RequestSigner(const std::string& signer_name) @@ -76,4 +76,4 @@ bool RsaRequestSigner::GenerateSignature(const std::string& message, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/request_signer.h b/packager/media/base/request_signer.h index 0075cba1ed..d7a6072253 100644 --- a/packager/media/base/request_signer.h +++ b/packager/media/base/request_signer.h @@ -11,7 +11,7 @@ #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { class AesCbcEncryptor; @@ -87,6 +87,6 @@ class RsaRequestSigner : public RequestSigner { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_REQUEST_SIGNER_H_ diff --git a/packager/media/base/rsa_key.cc b/packager/media/base/rsa_key.cc index fca52795d3..4edb3932d2 100644 --- a/packager/media/base/rsa_key.cc +++ b/packager/media/base/rsa_key.cc @@ -83,7 +83,7 @@ RSA* DeserializeRsaPublicKey(const std::string& serialized_key) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { RsaPrivateKey::RsaPrivateKey(RSA* rsa_key) : rsa_key_(rsa_key) { @@ -249,4 +249,4 @@ bool RsaPublicKey::VerifySignature(const std::string& message, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h index 83f9bf71cd..42ce07c770 100644 --- a/packager/media/base/rsa_key.h +++ b/packager/media/base/rsa_key.h @@ -17,7 +17,7 @@ struct rsa_st; typedef struct rsa_st RSA; -namespace edash_packager { +namespace shaka { namespace media { /// Rsa private key, used for message signing and decryption. @@ -79,6 +79,6 @@ class RsaPublicKey { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_RSA_KEY_H_ diff --git a/packager/media/base/rsa_key_unittest.cc b/packager/media/base/rsa_key_unittest.cc index bd5d908cd9..ce1a832bfc 100644 --- a/packager/media/base/rsa_key_unittest.cc +++ b/packager/media/base/rsa_key_unittest.cc @@ -19,7 +19,7 @@ namespace { const bool kIsFakePrngSupported = false; } // namespace -namespace edash_packager { +namespace shaka { namespace media { class RsaKeyTest : public ::testing::TestWithParam { @@ -160,4 +160,4 @@ INSTANTIATE_TEST_CASE_P(RsaTestKeys, RsaTestData().test_set_2048_bits())); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/status.cc b/packager/media/base/status.cc index 021023d7f7..df06a97aad 100644 --- a/packager/media/base/status.cc +++ b/packager/media/base/status.cc @@ -9,7 +9,7 @@ #include "packager/base/logging.h" #include "packager/base/strings/stringprintf.h" -namespace edash_packager { +namespace shaka { namespace media { namespace error { @@ -73,4 +73,4 @@ std::ostream& operator<<(std::ostream& os, const Status& x) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/status.h b/packager/media/base/status.h index a683fa5932..bdb027c9ae 100644 --- a/packager/media/base/status.h +++ b/packager/media/base/status.h @@ -10,7 +10,7 @@ #include #include -namespace edash_packager { +namespace shaka { namespace media { namespace error { @@ -160,6 +160,6 @@ class Status { std::ostream& operator<<(std::ostream& os, const Status& x); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_STATUS_H_ diff --git a/packager/media/base/status_test_util_unittest.cc b/packager/media/base/status_test_util_unittest.cc index 63beb03dd7..2c333efcc3 100644 --- a/packager/media/base/status_test_util_unittest.cc +++ b/packager/media/base/status_test_util_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/base/test/status_test_util.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(StatusTestUtil, ExpectOkSuccess) { @@ -30,4 +30,4 @@ TEST(StatusTestUtil, AssertOkFailure) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/status_unittest.cc b/packager/media/base/status_unittest.cc index d10e1c9b36..7e994d13f9 100644 --- a/packager/media/base/status_unittest.cc +++ b/packager/media/base/status_unittest.cc @@ -10,7 +10,7 @@ #include "packager/base/strings/string_number_conversions.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { static void CheckStatus(const Status& s, @@ -167,4 +167,4 @@ TEST(Status, EqualsDifferentMessage) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/stream_info.cc b/packager/media/base/stream_info.cc index 93645d07af..651e543a75 100644 --- a/packager/media/base/stream_info.cc +++ b/packager/media/base/stream_info.cc @@ -11,7 +11,7 @@ #include "packager/base/logging.h" #include "packager/base/strings/stringprintf.h" -namespace edash_packager { +namespace shaka { namespace media { StreamInfo::StreamInfo(StreamType stream_type, @@ -49,4 +49,4 @@ std::string StreamInfo::ToString() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/stream_info.h b/packager/media/base/stream_info.h index 7c8f7dbf12..701a195bc0 100644 --- a/packager/media/base/stream_info.h +++ b/packager/media/base/stream_info.h @@ -12,7 +12,7 @@ #include "packager/base/memory/ref_counted.h" -namespace edash_packager { +namespace shaka { namespace media { enum StreamType { @@ -91,6 +91,6 @@ class StreamInfo : public base::RefCountedThreadSafe { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_STREAM_INFO_H_ diff --git a/packager/media/base/test/fake_prng.cc b/packager/media/base/test/fake_prng.cc index feffe9f566..c9a284e48d 100644 --- a/packager/media/base/test/fake_prng.cc +++ b/packager/media/base/test/fake_prng.cc @@ -39,7 +39,7 @@ const RAND_METHOD kFakeRandMethod = {NULL, // RAND_seed function. } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace fake_prng { @@ -72,4 +72,4 @@ void StopFakePrng() { } // namespace fake_prng } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/test/fake_prng.h b/packager/media/base/test/fake_prng.h index 57bd1b2541..02bd7ed117 100644 --- a/packager/media/base/test/fake_prng.h +++ b/packager/media/base/test/fake_prng.h @@ -9,7 +9,7 @@ #ifndef MEDIA_BASE_FAKE_PRNG_H #define MEDIA_BASE_FAKE_PRNG_H -namespace edash_packager { +namespace shaka { namespace media { namespace fake_prng { @@ -22,6 +22,6 @@ void StopFakePrng(); } // namespace fake_prng } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_FAKE_PRNG_H diff --git a/packager/media/base/test/rsa_test_data.cc b/packager/media/base/test/rsa_test_data.cc index d2fbaddb0d..8819186282 100644 --- a/packager/media/base/test/rsa_test_data.cc +++ b/packager/media/base/test/rsa_test_data.cc @@ -445,7 +445,7 @@ const uint8_t kTestSignature_2048[] = { } // namespace -namespace edash_packager { +namespace shaka { namespace media { RsaTestSet::RsaTestSet() {} @@ -481,4 +481,4 @@ RsaTestData::RsaTestData() { RsaTestData::~RsaTestData() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/test/rsa_test_data.h b/packager/media/base/test/rsa_test_data.h index 61d22bbe43..60b1882bbe 100644 --- a/packager/media/base/test/rsa_test_data.h +++ b/packager/media/base/test/rsa_test_data.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { /// Self generated test vector to verify algorithm stability. @@ -45,6 +45,6 @@ class RsaTestData { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_RSA_TEST_DATA_H_ diff --git a/packager/media/base/test/status_test_util.h b/packager/media/base/test/status_test_util.h index fa48754173..6eabf5ee24 100644 --- a/packager/media/base/test/status_test_util.h +++ b/packager/media/base/test/status_test_util.h @@ -11,13 +11,13 @@ #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { #define EXPECT_OK(val) EXPECT_EQ(Status::OK, (val)) #define ASSERT_OK(val) ASSERT_EQ(Status::OK, (val)) } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_STATUS_TEST_UTIL_H_ diff --git a/packager/media/base/text_stream_info.cc b/packager/media/base/text_stream_info.cc index 59509996c9..4c69db9cab 100644 --- a/packager/media/base/text_stream_info.cc +++ b/packager/media/base/text_stream_info.cc @@ -6,7 +6,7 @@ #include "packager/media/base/text_stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { TextStreamInfo::TextStreamInfo(int track_id, @@ -36,4 +36,4 @@ bool TextStreamInfo::IsValidConfig() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/text_stream_info.h b/packager/media/base/text_stream_info.h index e968de0798..69a9ec0a3c 100644 --- a/packager/media/base/text_stream_info.h +++ b/packager/media/base/text_stream_info.h @@ -11,7 +11,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { class TextStreamInfo : public StreamInfo { @@ -52,6 +52,6 @@ class TextStreamInfo : public StreamInfo { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_BASE_TEXT_STREAM_INFO_H_ diff --git a/packager/media/base/text_track.h b/packager/media/base/text_track.h index 1d0cf84a22..3b90f50aec 100644 --- a/packager/media/base/text_track.h +++ b/packager/media/base/text_track.h @@ -11,7 +11,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/base/time/time.h" -namespace edash_packager { +namespace shaka { namespace media { /// Specifies the varieties of text tracks. @@ -39,6 +39,6 @@ typedef base::Callback const std::string& language)> AddTextTrackCB; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_TEXT_TRACK_H_ diff --git a/packager/media/base/text_track_config.cc b/packager/media/base/text_track_config.cc index 53bb20fbb0..93d56269da 100644 --- a/packager/media/base/text_track_config.cc +++ b/packager/media/base/text_track_config.cc @@ -4,7 +4,7 @@ #include "packager/media/base/text_track_config.h" -namespace edash_packager { +namespace shaka { namespace media { TextTrackConfig::TextTrackConfig() @@ -29,4 +29,4 @@ bool TextTrackConfig::Matches(const TextTrackConfig& config) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/text_track_config.h b/packager/media/base/text_track_config.h index 3bbb49ccf5..d3e69d4f3c 100644 --- a/packager/media/base/text_track_config.h +++ b/packager/media/base/text_track_config.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { // Specifies the varieties of text tracks. @@ -43,6 +43,6 @@ class TextTrackConfig { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_BASE_TEXT_TRACK_H_ diff --git a/packager/media/base/timestamp.h b/packager/media/base/timestamp.h index 1fb89e3869..92b502fa68 100644 --- a/packager/media/base/timestamp.h +++ b/packager/media/base/timestamp.h @@ -12,13 +12,13 @@ #include -namespace edash_packager { +namespace shaka { namespace media { const int64_t kNoTimestamp = std::numeric_limits::min(); const int64_t kInfiniteDuration = std::numeric_limits::max(); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_TIMESTAMP_H_ diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc index 48f32685c5..820e43b7c5 100644 --- a/packager/media/base/video_stream_info.cc +++ b/packager/media/base/video_stream_info.cc @@ -13,7 +13,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/media/base/limits.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -99,4 +99,4 @@ std::string VideoStreamInfo::ToString() const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/video_stream_info.h b/packager/media/base/video_stream_info.h index 91292e696d..ad2e949e75 100644 --- a/packager/media/base/video_stream_info.h +++ b/packager/media/base/video_stream_info.h @@ -9,7 +9,7 @@ #include "packager/media/base/stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { enum VideoCodec { @@ -97,6 +97,6 @@ class VideoStreamInfo : public StreamInfo { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_VIDEO_STREAM_INFO_H_ diff --git a/packager/media/base/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc index 0db2417ecf..bd0532bcc1 100644 --- a/packager/media/base/widevine_key_source.cc +++ b/packager/media/base/widevine_key_source.cc @@ -22,7 +22,7 @@ #include "packager/media/base/request_signer.h" #include "packager/media/base/widevine_pssh_data.pb.h" -namespace edash_packager { +namespace shaka { namespace { const bool kEnableKeyRotation = true; @@ -616,4 +616,4 @@ bool WidevineKeySource::PushToKeyPool( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/widevine_key_source.h b/packager/media/base/widevine_key_source.h index 5a20c08abe..caa34f9010 100644 --- a/packager/media/base/widevine_key_source.h +++ b/packager/media/base/widevine_key_source.h @@ -15,7 +15,7 @@ #include "packager/media/base/closure_thread.h" #include "packager/media/base/key_source.h" -namespace edash_packager { +namespace shaka { namespace media { class KeyFetcher; class RequestSigner; @@ -125,6 +125,6 @@ class WidevineKeySource : public KeySource { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_ diff --git a/packager/media/base/widevine_key_source_unittest.cc b/packager/media/base/widevine_key_source_unittest.cc index f41db07abb..d580603fe6 100644 --- a/packager/media/base/widevine_key_source_unittest.cc +++ b/packager/media/base/widevine_key_source_unittest.cc @@ -25,7 +25,7 @@ using ::testing::Return; using ::testing::SetArgPointee; using ::testing::StrEq; -namespace edash_packager { +namespace shaka { namespace { const char kServerUrl[] = "http://www.foo.com/getcontentkey"; const char kContentId[] = "ContentFoo"; @@ -519,4 +519,4 @@ INSTANTIATE_TEST_CASE_P(WidevineKeySourceInstance, ::testing::Bool()); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/base/widevine_pssh_data.proto b/packager/media/base/widevine_pssh_data.proto index c29f550d34..af14f36668 100644 --- a/packager/media/base/widevine_pssh_data.proto +++ b/packager/media/base/widevine_pssh_data.proto @@ -9,7 +9,7 @@ syntax = "proto2"; option optimize_for = LITE_RUNTIME; -package edash_packager.media; +package shaka.media; message WidevinePsshData { enum Algorithm { diff --git a/packager/media/event/hls_notify_muxer_listener.cc b/packager/media/event/hls_notify_muxer_listener.cc index 5a9186a887..1668f468a6 100644 --- a/packager/media/event/hls_notify_muxer_listener.cc +++ b/packager/media/event/hls_notify_muxer_listener.cc @@ -13,7 +13,7 @@ #include "packager/media/base/protection_system_specific_info.h" #include "packager/media/event/muxer_listener_internal.h" -namespace edash_packager { +namespace shaka { namespace media { HlsNotifyMuxerListener::HlsNotifyMuxerListener(const std::string& playlist_name, @@ -78,4 +78,4 @@ void HlsNotifyMuxerListener::OnNewSegment(const std::string& file_name, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/hls_notify_muxer_listener.h b/packager/media/event/hls_notify_muxer_listener.h index 8e4d18d9cf..86500155cf 100644 --- a/packager/media/event/hls_notify_muxer_listener.h +++ b/packager/media/event/hls_notify_muxer_listener.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" #include "packager/media/event/muxer_listener.h" -namespace edash_packager { +namespace shaka { namespace hls { class HlsNotifier; @@ -65,5 +65,5 @@ class HlsNotifyMuxerListener : public MuxerListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_EVENT_HLS_NOTIFY_MUXER_LISTENER_H_ diff --git a/packager/media/event/hls_notify_muxer_listener_unittest.cc b/packager/media/event/hls_notify_muxer_listener_unittest.cc index dac3b247b5..87d1e05a4e 100644 --- a/packager/media/event/hls_notify_muxer_listener_unittest.cc +++ b/packager/media/event/hls_notify_muxer_listener_unittest.cc @@ -13,7 +13,7 @@ #include "packager/media/event/hls_notify_muxer_listener.h" #include "packager/media/event/muxer_listener_test_helper.h" -namespace edash_packager { +namespace shaka { namespace media { using ::testing::Return; @@ -139,4 +139,4 @@ TEST_F(HlsNotifyMuxerListenerTest, OnNewSegment) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/mock_muxer_listener.cc b/packager/media/event/mock_muxer_listener.cc index ab200e52a9..a262bab5a8 100644 --- a/packager/media/event/mock_muxer_listener.cc +++ b/packager/media/event/mock_muxer_listener.cc @@ -6,11 +6,11 @@ #include "packager/media/event/mock_muxer_listener.h" -namespace edash_packager { +namespace shaka { namespace media { MockMuxerListener::MockMuxerListener() {} MockMuxerListener::~MockMuxerListener() {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/mock_muxer_listener.h b/packager/media/event/mock_muxer_listener.h index 88331c0964..c89f5f2a13 100644 --- a/packager/media/event/mock_muxer_listener.h +++ b/packager/media/event/mock_muxer_listener.h @@ -14,7 +14,7 @@ #include "packager/media/base/stream_info.h" #include "packager/media/event/muxer_listener.h" -namespace edash_packager { +namespace shaka { namespace media { class MockMuxerListener : public MuxerListener { @@ -56,6 +56,6 @@ class MockMuxerListener : public MuxerListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_EVENT_MOCK_MUXER_LISTENER_H_ diff --git a/packager/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc index c232e5e746..dd14843308 100644 --- a/packager/media/event/mpd_notify_muxer_listener.cc +++ b/packager/media/event/mpd_notify_muxer_listener.cc @@ -16,7 +16,7 @@ #include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/mpd_notifier.h" -namespace edash_packager { +namespace shaka { namespace media { MpdNotifyMuxerListener::MpdNotifyMuxerListener(MpdNotifier* mpd_notifier) @@ -162,4 +162,4 @@ void MpdNotifyMuxerListener::OnNewSegment(const std::string& file_name, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/mpd_notify_muxer_listener.h b/packager/media/event/mpd_notify_muxer_listener.h index afca244a2e..fa2e81cde2 100644 --- a/packager/media/event/mpd_notify_muxer_listener.h +++ b/packager/media/event/mpd_notify_muxer_listener.h @@ -17,7 +17,7 @@ #include "packager/media/base/muxer_options.h" #include "packager/media/event/muxer_listener.h" -namespace edash_packager { +namespace shaka { class MediaInfo; class MpdNotifier; @@ -86,6 +86,6 @@ class MpdNotifyMuxerListener : public MuxerListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_ diff --git a/packager/media/event/mpd_notify_muxer_listener_unittest.cc b/packager/media/event/mpd_notify_muxer_listener_unittest.cc index a0c4a719b6..bec0abb228 100644 --- a/packager/media/event/mpd_notify_muxer_listener_unittest.cc +++ b/packager/media/event/mpd_notify_muxer_listener_unittest.cc @@ -23,7 +23,7 @@ using ::testing::_; using ::testing::InSequence; -namespace edash_packager { +namespace shaka { namespace { @@ -406,4 +406,4 @@ TEST_F(MpdNotifyMuxerListenerTest, LiveWithKeyRotation) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/muxer_listener.h b/packager/media/event/muxer_listener.h index e3c597bb27..87fc929912 100644 --- a/packager/media/event/muxer_listener.h +++ b/packager/media/event/muxer_listener.h @@ -16,7 +16,7 @@ #include "packager/media/base/fourccs.h" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -126,6 +126,6 @@ class MuxerListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_MUXER_LISTENER_H_ diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc index f2f1663954..894fe333d8 100644 --- a/packager/media/event/muxer_listener_internal.cc +++ b/packager/media/event/muxer_listener_internal.cc @@ -18,7 +18,7 @@ #include "packager/media/filters/ec3_audio_util.h" #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace media { namespace internal { @@ -255,4 +255,4 @@ std::string CreateUUIDString(const std::vector& data) { } // namespace internal } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/muxer_listener_internal.h b/packager/media/event/muxer_listener_internal.h index 30143a2cd6..96695f4467 100644 --- a/packager/media/event/muxer_listener_internal.h +++ b/packager/media/event/muxer_listener_internal.h @@ -14,7 +14,7 @@ #include "packager/media/event/muxer_listener.h" -namespace edash_packager { +namespace shaka { class MediaInfo; @@ -64,5 +64,5 @@ std::string CreateUUIDString(const std::vector& data); } // namespace internal } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_ diff --git a/packager/media/event/muxer_listener_test_helper.cc b/packager/media/event/muxer_listener_test_helper.cc index 4a7489b420..ce989adda2 100644 --- a/packager/media/event/muxer_listener_test_helper.cc +++ b/packager/media/event/muxer_listener_test_helper.cc @@ -8,7 +8,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { VideoStreamInfoParameters::VideoStreamInfoParameters() {} @@ -126,4 +126,4 @@ bool MediaInfoEqual(const MediaInfo& expect, const MediaInfo& actual) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/muxer_listener_test_helper.h b/packager/media/event/muxer_listener_test_helper.h index e655446a82..d412e7f909 100644 --- a/packager/media/event/muxer_listener_test_helper.h +++ b/packager/media/event/muxer_listener_test_helper.h @@ -17,7 +17,7 @@ #include "packager/media/base/video_stream_info.h" #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace media { @@ -108,6 +108,6 @@ bool MediaInfoEqual(const MediaInfo& expect, const MediaInfo& actual); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_ diff --git a/packager/media/event/progress_listener.h b/packager/media/event/progress_listener.h index 2c9268a0ed..a9cfd5a5fd 100644 --- a/packager/media/event/progress_listener.h +++ b/packager/media/event/progress_listener.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { /// This class listens to progress updates events. @@ -33,6 +33,6 @@ class ProgressListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_PROGRESS_LISTENER_H_ diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc index 789436d2c0..11a6f9401b 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener.cc +++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc @@ -16,7 +16,7 @@ #include "packager/media/file/file.h" #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace media { VodMediaInfoDumpMuxerListener::VodMediaInfoDumpMuxerListener( @@ -128,4 +128,4 @@ bool VodMediaInfoDumpMuxerListener::WriteMediaInfoToFile( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.h b/packager/media/event/vod_media_info_dump_muxer_listener.h index 249cedadd7..fba8a5d027 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener.h +++ b/packager/media/event/vod_media_info_dump_muxer_listener.h @@ -19,7 +19,7 @@ #include "packager/media/base/muxer_options.h" #include "packager/media/event/muxer_listener.h" -namespace edash_packager { +namespace shaka { class MediaInfo; @@ -81,6 +81,6 @@ class VodMediaInfoDumpMuxerListener : public MuxerListener { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_ diff --git a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc index c4f9c770e7..6067a57467 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc +++ b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc @@ -34,7 +34,7 @@ const uint8_t kBogusIv[] = { const bool kInitialEncryptionInfo = true; } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -234,4 +234,4 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, CheckPixelWidthAndHeightSet) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/file.cc b/packager/media/file/file.cc index 17d47f748e..79c391cb92 100644 --- a/packager/media/file/file.cc +++ b/packager/media/file/file.cc @@ -25,7 +25,7 @@ DEFINE_uint64(io_block_size, 2ULL << 20, "Size of the block size used for threaded I/O, in bytes."); -namespace edash_packager { +namespace shaka { namespace media { const char* kLocalFilePrefix = "file://"; @@ -267,4 +267,4 @@ int64_t File::CopyFile(File* source, File* destination, int64_t max_copy) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/file.h b/packager/media/file/file.h index e361c2f240..9ba9ceedfe 100644 --- a/packager/media/file/file.h +++ b/packager/media/file/file.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { extern const char* kLocalFilePrefix; @@ -148,6 +148,6 @@ class File { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_FILE_FILE_H_ diff --git a/packager/media/file/file_closer.h b/packager/media/file/file_closer.h index 550c2fda5a..29f343e30a 100644 --- a/packager/media/file/file_closer.h +++ b/packager/media/file/file_closer.h @@ -10,7 +10,7 @@ #include "packager/base/logging.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { /// Used by scoped_ptr to automatically close the file when it goes out of @@ -28,6 +28,6 @@ struct FileCloser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILE_FILE_CLOSER_H_ diff --git a/packager/media/file/file_test_util.h b/packager/media/file/file_test_util.h index 48ee0e5a1c..d5f9947364 100644 --- a/packager/media/file/file_test_util.h +++ b/packager/media/file/file_test_util.h @@ -11,7 +11,7 @@ #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { #define ASSERT_FILE_EQ(file_name, array) \ @@ -23,7 +23,7 @@ namespace media { } while (false) } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILE_FILE_TEST_UTIL_H_ diff --git a/packager/media/file/file_unittest.cc b/packager/media/file/file_unittest.cc index 3ed3a6eede..6e6fb02bc4 100644 --- a/packager/media/file/file_unittest.cc +++ b/packager/media/file/file_unittest.cc @@ -17,7 +17,7 @@ namespace { const int kDataSize = 1024; } -namespace edash_packager { +namespace shaka { namespace media { class LocalFileTest : public testing::Test { @@ -280,4 +280,4 @@ TEST_F(LocalFileTest, DISABLED_ReadSeekOutOfBounds) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/io_cache.cc b/packager/media/file/io_cache.cc index 5d90754c3c..73fe151fde 100644 --- a/packager/media/file/io_cache.cc +++ b/packager/media/file/io_cache.cc @@ -12,7 +12,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { using base::AutoLock; using base::AutoUnlock; @@ -151,4 +151,4 @@ void IoCache::WaitUntilEmptyOrClosed() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/io_cache.h b/packager/media/file/io_cache.h index dcd5a1cf78..c43bba47b3 100644 --- a/packager/media/file/io_cache.h +++ b/packager/media/file/io_cache.h @@ -13,7 +13,7 @@ #include "packager/base/synchronization/lock.h" #include "packager/base/synchronization/waitable_event.h" -namespace edash_packager { +namespace shaka { namespace media { /// Declaration of class which implements a thread-safe circular buffer. @@ -81,6 +81,6 @@ class IoCache { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_FILE_IO_CACHE_H diff --git a/packager/media/file/io_cache_unittest.cc b/packager/media/file/io_cache_unittest.cc index 62881b9b22..2ba7192b30 100644 --- a/packager/media/file/io_cache_unittest.cc +++ b/packager/media/file/io_cache_unittest.cc @@ -18,7 +18,7 @@ const uint64_t kBlockSize = 256; const uint64_t kCacheSize = 16 * kBlockSize; } -namespace edash_packager { +namespace shaka { namespace media { class IoCacheTest : public testing::Test { @@ -269,4 +269,4 @@ TEST_F(IoCacheTest, LargeRead) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/local_file.cc b/packager/media/file/local_file.cc index ef29390af4..e59d7e0810 100644 --- a/packager/media/file/local_file.cc +++ b/packager/media/file/local_file.cc @@ -11,7 +11,7 @@ #include "packager/base/files/file_util.h" #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { LocalFile::LocalFile(const char* file_name, const char* mode) @@ -86,4 +86,4 @@ bool LocalFile::Delete(const char* file_name) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/local_file.h b/packager/media/file/local_file.h index ac4fe0ee15..924c04f9a6 100644 --- a/packager/media/file/local_file.h +++ b/packager/media/file/local_file.h @@ -14,7 +14,7 @@ #include "packager/base/compiler_specific.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { /// Implement LocalFile which deals with local storage. @@ -54,6 +54,6 @@ class LocalFile : public File { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_FILE_LOCAL_FILE_H_ diff --git a/packager/media/file/memory_file.cc b/packager/media/file/memory_file.cc index c2d2be9b93..4e13bd0ad3 100644 --- a/packager/media/file/memory_file.cc +++ b/packager/media/file/memory_file.cc @@ -13,7 +13,7 @@ #include "packager/base/logging.h" #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -136,5 +136,5 @@ void MemoryFile::Delete(const std::string& file_name) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/memory_file.h b/packager/media/file/memory_file.h index 544189be19..01807db31c 100644 --- a/packager/media/file/memory_file.h +++ b/packager/media/file/memory_file.h @@ -14,7 +14,7 @@ #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { /// Implements a File that is stored in memory. This should be only used for @@ -55,7 +55,7 @@ class MemoryFile : public File { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILE_MEDIA_FILE_H_ diff --git a/packager/media/file/memory_file_unittest.cc b/packager/media/file/memory_file_unittest.cc index 7ad5d6d257..cbd263545a 100644 --- a/packager/media/file/memory_file_unittest.cc +++ b/packager/media/file/memory_file_unittest.cc @@ -9,7 +9,7 @@ #include "packager/media/file/file_closer.h" #include "packager/media/file/memory_file.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -112,4 +112,4 @@ TEST_F(MemoryFileTest, WriteExistingFileDeletes) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/threaded_io_file.cc b/packager/media/file/threaded_io_file.cc index b71acb9abe..d2e6bf0fae 100644 --- a/packager/media/file/threaded_io_file.cc +++ b/packager/media/file/threaded_io_file.cc @@ -11,7 +11,7 @@ #include "packager/base/location.h" #include "packager/base/threading/worker_pool.h" -namespace edash_packager { +namespace shaka { namespace media { using base::subtle::NoBarrier_Load; @@ -209,4 +209,4 @@ void ThreadedIoFile::RunInOutputMode() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/threaded_io_file.h b/packager/media/file/threaded_io_file.h index 1fc2ee4c99..4056fa5451 100644 --- a/packager/media/file/threaded_io_file.h +++ b/packager/media/file/threaded_io_file.h @@ -14,7 +14,7 @@ #include "packager/media/file/file_closer.h" #include "packager/media/file/io_cache.h" -namespace edash_packager { +namespace shaka { namespace media { /// Declaration of class which implements a thread-safe circular buffer. @@ -70,6 +70,6 @@ class ThreadedIoFile : public File { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_FILE_THREADED_IO_FILE_H diff --git a/packager/media/file/udp_file.h b/packager/media/file/udp_file.h index 3afe6ab904..d85b25f699 100644 --- a/packager/media/file/udp_file.h +++ b/packager/media/file/udp_file.h @@ -14,7 +14,7 @@ #include "packager/base/compiler_specific.h" #include "packager/media/file/file.h" -namespace edash_packager { +namespace shaka { namespace media { /// Implements UdpFile, which receives UDP unicast and multicast streams. @@ -47,6 +47,6 @@ class UdpFile : public File { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILE_UDP_FILE_H_ diff --git a/packager/media/file/udp_file_posix.cc b/packager/media/file/udp_file_posix.cc index 6df6fbf368..e8354e91f4 100644 --- a/packager/media/file/udp_file_posix.cc +++ b/packager/media/file/udp_file_posix.cc @@ -25,7 +25,7 @@ DEFINE_string(udp_interface_address, "IP address of the interface over which to receive UDP unicast" " or multicast streams"); -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -218,4 +218,4 @@ bool UdpFile::Open() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/file/udp_file_win.cc b/packager/media/file/udp_file_win.cc index 38c94b2e75..1dde154846 100644 --- a/packager/media/file/udp_file_win.cc +++ b/packager/media/file/udp_file_win.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { UdpFile::UdpFile(const char* file_name) : File(file_name), socket_(0) { @@ -58,4 +58,4 @@ bool UdpFile::Open() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/avc_decoder_configuration.cc b/packager/media/filters/avc_decoder_configuration.cc index 57fd6441b6..fb656249ff 100644 --- a/packager/media/filters/avc_decoder_configuration.cc +++ b/packager/media/filters/avc_decoder_configuration.cc @@ -12,7 +12,7 @@ #include "packager/media/base/rcheck.h" #include "packager/media/filters/h264_parser.h" -namespace edash_packager { +namespace shaka { namespace media { AVCDecoderConfiguration::AVCDecoderConfiguration() @@ -104,4 +104,4 @@ std::string AVCDecoderConfiguration::GetCodecString( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/avc_decoder_configuration.h b/packager/media/filters/avc_decoder_configuration.h index 7db36a2798..9403717c0c 100644 --- a/packager/media/filters/avc_decoder_configuration.h +++ b/packager/media/filters/avc_decoder_configuration.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/decoder_configuration.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class for parsing AVC decoder configuration. @@ -59,6 +59,6 @@ class AVCDecoderConfiguration : public DecoderConfiguration { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_AVC_DECODER_CONFIGURATION_H_ diff --git a/packager/media/filters/avc_decoder_configuration_unittest.cc b/packager/media/filters/avc_decoder_configuration_unittest.cc index 6544ed6d7b..9938a91c9a 100644 --- a/packager/media/filters/avc_decoder_configuration_unittest.cc +++ b/packager/media/filters/avc_decoder_configuration_unittest.cc @@ -8,7 +8,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { TEST(AVCDecoderConfigurationTest, Success) { @@ -61,4 +61,4 @@ TEST(AVCDecoderConfigurationTest, GetCodecString) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/decoder_configuration.cc b/packager/media/filters/decoder_configuration.cc index 70313239e8..ae495264c7 100644 --- a/packager/media/filters/decoder_configuration.cc +++ b/packager/media/filters/decoder_configuration.cc @@ -6,7 +6,7 @@ #include "packager/media/filters/decoder_configuration.h" -namespace edash_packager { +namespace shaka { namespace media { DecoderConfiguration::DecoderConfiguration() : nalu_length_size_(0) {} @@ -23,4 +23,4 @@ void DecoderConfiguration::AddNalu(const Nalu& nalu) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/decoder_configuration.h b/packager/media/filters/decoder_configuration.h index cee45f5909..c8589d1d01 100644 --- a/packager/media/filters/decoder_configuration.h +++ b/packager/media/filters/decoder_configuration.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { // Defines a base class for decoder configurations. @@ -75,6 +75,6 @@ class DecoderConfiguration { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_DECODER_CONFIGURATION_H_ diff --git a/packager/media/filters/ec3_audio_util.cc b/packager/media/filters/ec3_audio_util.cc index dcc1d2303f..e7d23df71f 100644 --- a/packager/media/filters/ec3_audio_util.cc +++ b/packager/media/filters/ec3_audio_util.cc @@ -8,7 +8,7 @@ #include "packager/media/base/rcheck.h" #include "packager/media/filters/ec3_audio_util.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -152,4 +152,4 @@ bool CalculateEC3ChannelMap(const std::vector& ec3_data, uint32_t* chan } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/ec3_audio_util.h b/packager/media/filters/ec3_audio_util.h index 05626e0973..b99c224146 100644 --- a/packager/media/filters/ec3_audio_util.h +++ b/packager/media/filters/ec3_audio_util.h @@ -12,7 +12,7 @@ #include #include -namespace edash_packager { +namespace shaka { namespace media { /// Parse data from EC3Specific box and calculate EC3 channel map value based on @@ -22,6 +22,6 @@ bool CalculateEC3ChannelMap(const std::vector& ec3_data, uint32_t* channel_map); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_EC3_AUDIO_UTIL_H_ diff --git a/packager/media/filters/ec3_audio_util_unittest.cc b/packager/media/filters/ec3_audio_util_unittest.cc index 64d3029198..45a970c501 100644 --- a/packager/media/filters/ec3_audio_util_unittest.cc +++ b/packager/media/filters/ec3_audio_util_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/ec3_audio_util.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(EC3AudioUtilTest, CalculateEC3ChannelMapTest1) { @@ -47,4 +47,4 @@ TEST(EC3AudioUtilTest, CalculateEC3ChannelMapTest3) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h264_byte_to_unit_stream_converter.cc b/packager/media/filters/h264_byte_to_unit_stream_converter.cc index 4f2693926e..a079b80365 100644 --- a/packager/media/filters/h264_byte_to_unit_stream_converter.cc +++ b/packager/media/filters/h264_byte_to_unit_stream_converter.cc @@ -12,7 +12,7 @@ #include "packager/media/base/buffer_writer.h" #include "packager/media/filters/h264_parser.h" -namespace edash_packager { +namespace shaka { namespace media { H264ByteToUnitStreamConverter::H264ByteToUnitStreamConverter() @@ -77,4 +77,4 @@ bool H264ByteToUnitStreamConverter::ProcessNalu(const Nalu& nalu) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h264_byte_to_unit_stream_converter.h b/packager/media/filters/h264_byte_to_unit_stream_converter.h index 88837ce662..823b78b3fd 100644 --- a/packager/media/filters/h264_byte_to_unit_stream_converter.h +++ b/packager/media/filters/h264_byte_to_unit_stream_converter.h @@ -14,7 +14,7 @@ #include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class which converts H.264 byte streams (as specified in ISO/IEC 14496-10 @@ -40,6 +40,6 @@ class H264ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_ diff --git a/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc b/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc index d5606bb0a0..756f040e07 100644 --- a/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc +++ b/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc @@ -17,7 +17,7 @@ const char kExpectedConfigRecord[] = "28de0988"; } -namespace edash_packager { +namespace shaka { namespace media { TEST(H264ByteToUnitStreamConverter, ConversionSuccess) { @@ -60,4 +60,4 @@ TEST(H264ByteToUnitStreamConverter, ConversionFailure) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h264_parser.cc b/packager/media/filters/h264_parser.cc index 7c8783f3d5..9bd0bb7a68 100644 --- a/packager/media/filters/h264_parser.cc +++ b/packager/media/filters/h264_parser.cc @@ -9,7 +9,7 @@ #include "packager/base/stl_util.h" #include "packager/media/base/buffer_reader.h" -namespace edash_packager { +namespace shaka { namespace media { // Implemented according to ISO/IEC 14496-10:2005 7.4.2.1 Sequence parameter set @@ -1174,4 +1174,4 @@ H264Parser::Result H264Parser::ParseSEI(const Nalu& nalu, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h264_parser.h b/packager/media/filters/h264_parser.h index ea74af5938..fd4371d9a3 100644 --- a/packager/media/filters/h264_parser.h +++ b/packager/media/filters/h264_parser.h @@ -15,7 +15,7 @@ #include "packager/media/filters/h26x_bit_reader.h" #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { // On success, |coded_width| and |coded_height| contains coded resolution after @@ -333,6 +333,6 @@ class H264Parser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H264_PARSER_H_ diff --git a/packager/media/filters/h264_parser_unittest.cc b/packager/media/filters/h264_parser_unittest.cc index 1c8f02f6e7..f705e1b078 100644 --- a/packager/media/filters/h264_parser_unittest.cc +++ b/packager/media/filters/h264_parser_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/test/test_data_util.h" #include "packager/media/filters/h264_parser.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(H264ParserTest, StreamFileParsing) { @@ -116,4 +116,4 @@ TEST(H264ParserTest, ExtractResolutionFromSpsDataWithCropping) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h265_byte_to_unit_stream_converter.cc b/packager/media/filters/h265_byte_to_unit_stream_converter.cc index a518667c54..6e77f822d7 100644 --- a/packager/media/filters/h265_byte_to_unit_stream_converter.cc +++ b/packager/media/filters/h265_byte_to_unit_stream_converter.cc @@ -13,7 +13,7 @@ #include "packager/media/base/rcheck.h" #include "packager/media/filters/h265_parser.h" -namespace edash_packager { +namespace shaka { namespace media { H265ByteToUnitStreamConverter::H265ByteToUnitStreamConverter() @@ -121,4 +121,4 @@ bool H265ByteToUnitStreamConverter::ProcessNalu(const Nalu& nalu) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h265_byte_to_unit_stream_converter.h b/packager/media/filters/h265_byte_to_unit_stream_converter.h index 8aab2d595f..ff4111f82f 100644 --- a/packager/media/filters/h265_byte_to_unit_stream_converter.h +++ b/packager/media/filters/h265_byte_to_unit_stream_converter.h @@ -14,7 +14,7 @@ #include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class which converts H.265 byte streams (as specified in ISO/IEC 14496-10 @@ -41,6 +41,6 @@ class H265ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_ diff --git a/packager/media/filters/h265_byte_to_unit_stream_converter_unittest.cc b/packager/media/filters/h265_byte_to_unit_stream_converter_unittest.cc index a1fcd13f09..995688702e 100644 --- a/packager/media/filters/h265_byte_to_unit_stream_converter_unittest.cc +++ b/packager/media/filters/h265_byte_to_unit_stream_converter_unittest.cc @@ -20,7 +20,7 @@ const char kExpectedConfigRecord[] = "0003000003005d999809"; } -namespace edash_packager { +namespace shaka { namespace media { TEST(H265ByteToUnitStreamConverter, ConversionSuccess) { @@ -72,4 +72,4 @@ TEST(H265ByteToUnitStreamConverter, ConversionFailure) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h265_parser.cc b/packager/media/filters/h265_parser.cc index 2a101cbe95..6c89f7d559 100644 --- a/packager/media/filters/h265_parser.cc +++ b/packager/media/filters/h265_parser.cc @@ -29,7 +29,7 @@ return status; \ } while (false) -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -1113,4 +1113,4 @@ H265Parser::Result H265Parser::SkipSubLayerHrdParameters( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h265_parser.h b/packager/media/filters/h265_parser.h index 0fe7a596ca..77380f9d9e 100644 --- a/packager/media/filters/h265_parser.h +++ b/packager/media/filters/h265_parser.h @@ -13,7 +13,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/filters/h26x_bit_reader.h" -namespace edash_packager { +namespace shaka { namespace media { class Nalu; @@ -352,6 +352,6 @@ class H265Parser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H265_PARSER_H_ diff --git a/packager/media/filters/h265_parser_unittest.cc b/packager/media/filters/h265_parser_unittest.cc index 3e133043d8..f2ad61aeb3 100644 --- a/packager/media/filters/h265_parser_unittest.cc +++ b/packager/media/filters/h265_parser_unittest.cc @@ -9,7 +9,7 @@ #include "packager/media/filters/h265_parser.h" #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { namespace H265 { @@ -175,4 +175,4 @@ TEST(H265ParserTest, ExtractResolutionFromSpsDataWithCrop) { } // namespace H265 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h26x_bit_reader.cc b/packager/media/filters/h26x_bit_reader.cc index 2a8cbd75e0..23634b2fa7 100644 --- a/packager/media/filters/h26x_bit_reader.cc +++ b/packager/media/filters/h26x_bit_reader.cc @@ -5,7 +5,7 @@ #include "packager/base/logging.h" #include "packager/media/filters/h26x_bit_reader.h" -namespace edash_packager { +namespace shaka { namespace media { H26xBitReader::H26xBitReader() @@ -166,4 +166,4 @@ size_t H26xBitReader::NumEmulationPreventionBytesRead() { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h26x_bit_reader.h b/packager/media/filters/h26x_bit_reader.h index 65cb8e8ad9..1291d4e495 100644 --- a/packager/media/filters/h26x_bit_reader.h +++ b/packager/media/filters/h26x_bit_reader.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { // A class to provide bit-granularity reading of H.264/H.265 streams. @@ -96,6 +96,6 @@ class H26xBitReader { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H264_BIT_READER_H_ diff --git a/packager/media/filters/h26x_bit_reader_unittest.cc b/packager/media/filters/h26x_bit_reader_unittest.cc index 200fd68551..1552aab495 100644 --- a/packager/media/filters/h26x_bit_reader_unittest.cc +++ b/packager/media/filters/h26x_bit_reader_unittest.cc @@ -6,7 +6,7 @@ #include "packager/media/filters/h26x_bit_reader.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(H26xBitReaderTest, ReadStreamWithoutEscapeAndTrailingZeroBytes) { @@ -113,4 +113,4 @@ TEST(H26xBitReaderTest, StopBitOccupyFullByte) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h26x_byte_to_unit_stream_converter.cc b/packager/media/filters/h26x_byte_to_unit_stream_converter.cc index 4ec2d3dbc2..9643acb65e 100644 --- a/packager/media/filters/h26x_byte_to_unit_stream_converter.cc +++ b/packager/media/filters/h26x_byte_to_unit_stream_converter.cc @@ -11,7 +11,7 @@ #include "packager/base/logging.h" #include "packager/media/base/buffer_writer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -58,5 +58,5 @@ bool H26xByteToUnitStreamConverter::ConvertByteStreamToNalUnitStream( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/h26x_byte_to_unit_stream_converter.h b/packager/media/filters/h26x_byte_to_unit_stream_converter.h index 781f353e4e..57176b0f25 100644 --- a/packager/media/filters/h26x_byte_to_unit_stream_converter.h +++ b/packager/media/filters/h26x_byte_to_unit_stream_converter.h @@ -13,7 +13,7 @@ #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -58,7 +58,7 @@ class H26xByteToUnitStreamConverter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_H26x_BYTE_TO_UNIT_STREAM_CONVERTER_H_ diff --git a/packager/media/filters/hevc_decoder_configuration.cc b/packager/media/filters/hevc_decoder_configuration.cc index 3feba2745d..01f968131b 100644 --- a/packager/media/filters/hevc_decoder_configuration.cc +++ b/packager/media/filters/hevc_decoder_configuration.cc @@ -11,7 +11,7 @@ #include "packager/media/base/buffer_reader.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -157,4 +157,4 @@ std::string HEVCDecoderConfiguration::GetCodecString(VideoCodec codec) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/hevc_decoder_configuration.h b/packager/media/filters/hevc_decoder_configuration.h index 0b111ebf40..22aacacd32 100644 --- a/packager/media/filters/hevc_decoder_configuration.h +++ b/packager/media/filters/hevc_decoder_configuration.h @@ -15,7 +15,7 @@ #include "packager/media/base/video_stream_info.h" #include "packager/media/filters/decoder_configuration.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class for parsing HEVC decoder configuration. @@ -42,6 +42,6 @@ class HEVCDecoderConfiguration : public DecoderConfiguration { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_HEVC_DECODER_CONFIGURATION_H_ diff --git a/packager/media/filters/hevc_decoder_configuration_unittest.cc b/packager/media/filters/hevc_decoder_configuration_unittest.cc index 4860c5ed8c..5f1728c4b7 100644 --- a/packager/media/filters/hevc_decoder_configuration_unittest.cc +++ b/packager/media/filters/hevc_decoder_configuration_unittest.cc @@ -8,7 +8,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { TEST(HEVCDecoderConfigurationTest, Success) { @@ -62,4 +62,4 @@ TEST(HEVCDecoderConfigurationTest, FailOnInsufficientData) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/nal_unit_to_byte_stream_converter.cc b/packager/media/filters/nal_unit_to_byte_stream_converter.cc index a60c32fcb6..611c83642f 100644 --- a/packager/media/filters/nal_unit_to_byte_stream_converter.cc +++ b/packager/media/filters/nal_unit_to_byte_stream_converter.cc @@ -16,7 +16,7 @@ #include "packager/media/filters/avc_decoder_configuration.h" #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -186,4 +186,4 @@ bool NalUnitToByteStreamConverter::ConvertUnitToByteStream( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/nal_unit_to_byte_stream_converter.h b/packager/media/filters/nal_unit_to_byte_stream_converter.h index 8959f71870..c25565c8bd 100644 --- a/packager/media/filters/nal_unit_to_byte_stream_converter.h +++ b/packager/media/filters/nal_unit_to_byte_stream_converter.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" #include "packager/base/memory/ref_counted.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -71,6 +71,6 @@ class NalUnitToByteStreamConverter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FILTERS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_ diff --git a/packager/media/filters/nal_unit_to_byte_stream_converter_unittest.cc b/packager/media/filters/nal_unit_to_byte_stream_converter_unittest.cc index 6929194497..14404ef9cc 100644 --- a/packager/media/filters/nal_unit_to_byte_stream_converter_unittest.cc +++ b/packager/media/filters/nal_unit_to_byte_stream_converter_unittest.cc @@ -9,7 +9,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/filters/nal_unit_to_byte_stream_converter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -371,4 +371,4 @@ TEST(NalUnitToByteStreamConverterTest, DoNotEscape) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/nalu_reader.cc b/packager/media/filters/nalu_reader.cc index d0dfa2ee87..8f01d22c29 100644 --- a/packager/media/filters/nalu_reader.cc +++ b/packager/media/filters/nalu_reader.cc @@ -12,7 +12,7 @@ #include "packager/media/base/buffer_reader.h" #include "packager/media/filters/h264_parser.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -332,4 +332,4 @@ bool NaluReader::LocateNaluByStartCode(uint64_t* nalu_size, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/nalu_reader.h b/packager/media/filters/nalu_reader.h index a95040f312..b9a8864cbb 100644 --- a/packager/media/filters/nalu_reader.h +++ b/packager/media/filters/nalu_reader.h @@ -13,7 +13,7 @@ #include "packager/base/compiler_specific.h" #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { // Used as the |nalu_length_size| argument to NaluReader to indicate to use @@ -212,6 +212,6 @@ class NaluReader { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_NALU_READER_H_ diff --git a/packager/media/filters/nalu_reader_unittest.cc b/packager/media/filters/nalu_reader_unittest.cc index a57b61771b..e416b066c3 100644 --- a/packager/media/filters/nalu_reader_unittest.cc +++ b/packager/media/filters/nalu_reader_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/filters/nalu_reader.h" -namespace edash_packager { +namespace shaka { namespace media { TEST(NaluReaderTest, StartCodeSearch) { @@ -188,4 +188,4 @@ TEST(NaluReaderTest, ErrorForZeroSize) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp8_parser.cc b/packager/media/filters/vp8_parser.cc index 1e770e8b53..b17ff68800 100644 --- a/packager/media/filters/vp8_parser.cc +++ b/packager/media/filters/vp8_parser.cc @@ -10,7 +10,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -192,4 +192,4 @@ bool VP8Parser::IsKeyframe(const uint8_t* data, size_t data_size) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp8_parser.h b/packager/media/filters/vp8_parser.h index 1c197fd0ba..fbc9ff36e2 100644 --- a/packager/media/filters/vp8_parser.h +++ b/packager/media/filters/vp8_parser.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/vpx_parser.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class to parse a vp8 bit stream. Implemented according to @@ -50,6 +50,6 @@ class VP8Parser : public VPxParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_VP8_PARSER_H_ diff --git a/packager/media/filters/vp8_parser_unittest.cc b/packager/media/filters/vp8_parser_unittest.cc index 9ca7d47c1c..af72970cf5 100644 --- a/packager/media/filters/vp8_parser_unittest.cc +++ b/packager/media/filters/vp8_parser_unittest.cc @@ -11,7 +11,7 @@ using ::testing::ElementsAre; -namespace edash_packager { +namespace shaka { namespace media { namespace { MATCHER_P5(EqualVPxFrame, @@ -102,4 +102,4 @@ TEST(VP8ParserTest, NotEnoughBytesForHeaderSize) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp9_parser.cc b/packager/media/filters/vp9_parser.cc index c2de0dfd01..f4c7cfe1f6 100644 --- a/packager/media/filters/vp9_parser.cc +++ b/packager/media/filters/vp9_parser.cc @@ -10,7 +10,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -557,4 +557,4 @@ bool VP9Parser::IsKeyframe(const uint8_t* data, size_t data_size) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp9_parser.h b/packager/media/filters/vp9_parser.h index e2135b3339..32389b1d61 100644 --- a/packager/media/filters/vp9_parser.h +++ b/packager/media/filters/vp9_parser.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/vpx_parser.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class to parse a vp9 bit stream. @@ -49,6 +49,6 @@ class VP9Parser : public VPxParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_VP9_PARSER_H_ diff --git a/packager/media/filters/vp9_parser_unittest.cc b/packager/media/filters/vp9_parser_unittest.cc index 0c2ec43119..c51e9da6a9 100644 --- a/packager/media/filters/vp9_parser_unittest.cc +++ b/packager/media/filters/vp9_parser_unittest.cc @@ -11,7 +11,7 @@ using ::testing::ElementsAre; -namespace edash_packager { +namespace shaka { namespace media { namespace { MATCHER_P5(EqualVPxFrame, @@ -247,4 +247,4 @@ TEST(VP9ParserTest, NotEnoughBytesForHeaderSize) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp_codec_configuration.cc b/packager/media/filters/vp_codec_configuration.cc index aad74a8023..a344367ef0 100644 --- a/packager/media/filters/vp_codec_configuration.cc +++ b/packager/media/filters/vp_codec_configuration.cc @@ -13,7 +13,7 @@ #include "packager/media/base/rcheck.h" #include "packager/base/strings/stringprintf.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -118,4 +118,4 @@ std::string VPCodecConfiguration::GetCodecString(VideoCodec codec) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vp_codec_configuration.h b/packager/media/filters/vp_codec_configuration.h index 4fe04fd03e..1abdcd064d 100644 --- a/packager/media/filters/vp_codec_configuration.h +++ b/packager/media/filters/vp_codec_configuration.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/base/video_stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { /// Class for parsing or writing VP codec configuration data. @@ -99,6 +99,6 @@ class VPCodecConfiguration { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_VP_CODEC_CONFIGURATION_H_ diff --git a/packager/media/filters/vp_codec_configuration_unittest.cc b/packager/media/filters/vp_codec_configuration_unittest.cc index 6c8a29ed4e..3c5fc2039b 100644 --- a/packager/media/filters/vp_codec_configuration_unittest.cc +++ b/packager/media/filters/vp_codec_configuration_unittest.cc @@ -8,7 +8,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { TEST(VPCodecConfigurationTest, Parse) { @@ -60,4 +60,4 @@ TEST(VPCodecConfigurationTest, Write) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/filters/vpx_parser.h b/packager/media/filters/vpx_parser.h index 2fdcba20b0..ab5d2a5622 100644 --- a/packager/media/filters/vpx_parser.h +++ b/packager/media/filters/vpx_parser.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" #include "packager/media/filters/vp_codec_configuration.h" -namespace edash_packager { +namespace shaka { namespace media { struct VPxFrameInfo { @@ -53,6 +53,6 @@ class VPxParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FILTERS_VPX_PARSER_H_ diff --git a/packager/media/filters/webvtt_util.h b/packager/media/filters/webvtt_util.h index 5e662594a7..689d8340e4 100644 --- a/packager/media/filters/webvtt_util.h +++ b/packager/media/filters/webvtt_util.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { // Utility function to create side data item for decoder buffer. @@ -27,6 +27,6 @@ void MakeSideData(T id_begin, T id_end, } } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FILTERS_WEBVTT_UTIL_H_ diff --git a/packager/media/formats/mp2t/adts_header.cc b/packager/media/formats/mp2t/adts_header.cc index 80f634c0c6..73d05c6a03 100644 --- a/packager/media/formats/mp2t/adts_header.cc +++ b/packager/media/formats/mp2t/adts_header.cc @@ -10,7 +10,7 @@ #include "packager/media/formats/mp2t/mp2t_common.h" #include "packager/media/formats/mpeg/adts_constants.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -111,4 +111,4 @@ uint8_t AdtsHeader::GetNumChannels() const { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/adts_header.h b/packager/media/formats/mp2t/adts_header.h index 1b248c9c44..777da1c981 100644 --- a/packager/media/formats/mp2t/adts_header.h +++ b/packager/media/formats/mp2t/adts_header.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -71,6 +71,6 @@ class AdtsHeader { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP2T_ADTS_HEADER_H_ diff --git a/packager/media/formats/mp2t/adts_header_unittest.cc b/packager/media/formats/mp2t/adts_header_unittest.cc index d0ed356c19..f1c422787b 100644 --- a/packager/media/formats/mp2t/adts_header_unittest.cc +++ b/packager/media/formats/mp2t/adts_header_unittest.cc @@ -35,7 +35,7 @@ const uint8_t kExpectedAudioSpecificConfig[] = {0x12, 0x10}; } // anonymous namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -91,4 +91,4 @@ TEST_F(AdtsHeaderTest, GetHeaderSizeSuccess) { } // Namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/continuity_counter.cc b/packager/media/formats/mp2t/continuity_counter.cc index ed61c29e19..0e4ca3a8f5 100644 --- a/packager/media/formats/mp2t/continuity_counter.cc +++ b/packager/media/formats/mp2t/continuity_counter.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/mp2t/continuity_counter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -22,4 +22,4 @@ int ContinuityCounter::GetNext() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/continuity_counter.h b/packager/media/formats/mp2t/continuity_counter.h index 0a62386c3d..8fba9c6d4c 100644 --- a/packager/media/formats/mp2t/continuity_counter.h +++ b/packager/media/formats/mp2t/continuity_counter.h @@ -9,7 +9,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -30,6 +30,6 @@ class ContinuityCounter { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_CONTINUITY_COUNTER_H_ diff --git a/packager/media/formats/mp2t/es_parser.h b/packager/media/formats/mp2t/es_parser.h index a309f82caa..f01034a4d9 100644 --- a/packager/media/formats/mp2t/es_parser.h +++ b/packager/media/formats/mp2t/es_parser.h @@ -10,7 +10,7 @@ #include "packager/base/callback.h" #include "packager/base/memory/ref_counted.h" -namespace edash_packager { +namespace shaka { namespace media { class MediaSample; @@ -49,6 +49,6 @@ class EsParser { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/es_parser_adts.cc b/packager/media/formats/mp2t/es_parser_adts.cc index a88ae8c053..75f102bb80 100644 --- a/packager/media/formats/mp2t/es_parser_adts.cc +++ b/packager/media/formats/mp2t/es_parser_adts.cc @@ -18,7 +18,7 @@ #include "packager/media/formats/mp2t/mp2t_common.h" #include "packager/media/formats/mpeg/adts_constants.h" -namespace edash_packager { +namespace shaka { namespace media { // Return true if buf corresponds to an ADTS syncword. @@ -277,4 +277,4 @@ void EsParserAdts::DiscardEs(int nbytes) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/es_parser_adts.h b/packager/media/formats/mp2t/es_parser_adts.h index 921ce8f03e..5b899ae55b 100644 --- a/packager/media/formats/mp2t/es_parser_adts.h +++ b/packager/media/formats/mp2t/es_parser_adts.h @@ -15,7 +15,7 @@ #include "packager/media/base/byte_queue.h" #include "packager/media/formats/mp2t/es_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class AudioTimestampHelper; class BitReader; @@ -74,6 +74,6 @@ class EsParserAdts : public EsParser { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/es_parser_h264.cc b/packager/media/formats/mp2t/es_parser_h264.cc index d8014c946e..6dbafa839d 100644 --- a/packager/media/formats/mp2t/es_parser_h264.cc +++ b/packager/media/formats/mp2t/es_parser_h264.cc @@ -15,7 +15,7 @@ #include "packager/media/filters/h264_parser.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -174,4 +174,4 @@ bool EsParserH264::UpdateVideoDecoderConfig(int pps_id) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/es_parser_h264.h b/packager/media/formats/mp2t/es_parser_h264.h index 924119fff9..24b05041d4 100644 --- a/packager/media/formats/mp2t/es_parser_h264.h +++ b/packager/media/formats/mp2t/es_parser_h264.h @@ -11,7 +11,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/mp2t/es_parser_h26x.h" -namespace edash_packager { +namespace shaka { namespace media { class H264Parser; @@ -55,6 +55,6 @@ class EsParserH264 : public EsParserH26x { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/es_parser_h264_unittest.cc b/packager/media/formats/mp2t/es_parser_h264_unittest.cc index 210b3dc1c0..67bd4d9a01 100644 --- a/packager/media/formats/mp2t/es_parser_h264_unittest.cc +++ b/packager/media/formats/mp2t/es_parser_h264_unittest.cc @@ -16,7 +16,7 @@ #include "packager/media/formats/mp2t/es_parser_h264.h" #include "packager/media/test/test_data_util.h" -namespace edash_packager { +namespace shaka { namespace media { class VideoStreamInfo; @@ -297,4 +297,4 @@ TEST_F(EsParserH264Test, PixelWidthPixelHeight) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/es_parser_h265.cc b/packager/media/formats/mp2t/es_parser_h265.cc index 173c0210fb..f6c058e810 100644 --- a/packager/media/formats/mp2t/es_parser_h265.cc +++ b/packager/media/formats/mp2t/es_parser_h265.cc @@ -18,7 +18,7 @@ #include "packager/media/filters/h265_parser.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -174,4 +174,4 @@ bool EsParserH265::UpdateVideoDecoderConfig(int pps_id) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/es_parser_h265.h b/packager/media/formats/mp2t/es_parser_h265.h index a4173e5b87..b43a6be1c8 100644 --- a/packager/media/formats/mp2t/es_parser_h265.h +++ b/packager/media/formats/mp2t/es_parser_h265.h @@ -17,7 +17,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/mp2t/es_parser_h26x.h" -namespace edash_packager { +namespace shaka { namespace media { class H265Parser; @@ -57,6 +57,6 @@ class EsParserH265 : public EsParserH26x { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_ diff --git a/packager/media/formats/mp2t/es_parser_h26x.cc b/packager/media/formats/mp2t/es_parser_h26x.cc index 707c181bc9..29570651f5 100644 --- a/packager/media/formats/mp2t/es_parser_h26x.cc +++ b/packager/media/formats/mp2t/es_parser_h26x.cc @@ -16,7 +16,7 @@ #include "packager/media/filters/h265_byte_to_unit_stream_converter.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -281,4 +281,4 @@ bool EsParserH26x::EmitFrame(int64_t access_unit_pos, } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/es_parser_h26x.h b/packager/media/formats/mp2t/es_parser_h26x.h index 7279d3ffa0..981500ca4b 100644 --- a/packager/media/formats/mp2t/es_parser_h26x.h +++ b/packager/media/formats/mp2t/es_parser_h26x.h @@ -15,7 +15,7 @@ #include "packager/media/filters/nalu_reader.h" #include "packager/media/formats/mp2t/es_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class H26xByteToUnitStreamConverter; @@ -104,6 +104,6 @@ class EsParserH26x : public EsParser { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc index adbf8c84c5..3ab822a021 100644 --- a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc +++ b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc @@ -16,7 +16,7 @@ #include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" #include "packager/media/formats/mp2t/es_parser_h26x.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -298,4 +298,4 @@ TEST_F(EsParserH26xTest, DISABLED_EmitsLastFrameWithNuhLayerId) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/mp2t_common.h b/packager/media/formats/mp2t/mp2t_common.h index 1dfde0391d..36237e3c4e 100644 --- a/packager/media/formats/mp2t/mp2t_common.h +++ b/packager/media/formats/mp2t/mp2t_common.h @@ -19,10 +19,10 @@ #endif -namespace edash_packager { +namespace shaka { namespace media { const uint32_t kMpeg2Timescale = 90000; } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/mp2t_media_parser.cc b/packager/media/formats/mp2t/mp2t_media_parser.cc index 60bae5734d..885f65687f 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser.cc +++ b/packager/media/formats/mp2t/mp2t_media_parser.cc @@ -20,7 +20,7 @@ #include "packager/media/formats/mp2t/ts_section_pes.h" #include "packager/media/formats/mp2t/ts_section_pmt.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -437,4 +437,4 @@ bool Mp2tMediaParser::EmitRemainingSamples() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/mp2t_media_parser.h b/packager/media/formats/mp2t/mp2t_media_parser.h index 9a3b9456be..04ee04a6c6 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser.h +++ b/packager/media/formats/mp2t/mp2t_media_parser.h @@ -15,7 +15,7 @@ #include "packager/media/base/media_parser.h" #include "packager/media/base/stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { class MediaSample; @@ -94,6 +94,6 @@ class Mp2tMediaParser : public MediaParser { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc index 229bb6f920..67f7a0e415 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc +++ b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc @@ -19,7 +19,7 @@ #include "packager/media/formats/mp2t/mp2t_media_parser.h" #include "packager/media/test/test_data_util.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -163,4 +163,4 @@ TEST_F(Mp2tMediaParserTest, TimestampWrapAround) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/pes_packet.cc b/packager/media/formats/mp2t/pes_packet.cc index 810b083ec5..d852e9f6d9 100644 --- a/packager/media/formats/mp2t/pes_packet.cc +++ b/packager/media/formats/mp2t/pes_packet.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/mp2t/pes_packet.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -15,4 +15,4 @@ PesPacket::~PesPacket() {} } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/pes_packet.h b/packager/media/formats/mp2t/pes_packet.h index 31e056a7e4..3a06d08c0f 100644 --- a/packager/media/formats/mp2t/pes_packet.h +++ b/packager/media/formats/mp2t/pes_packet.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -64,6 +64,6 @@ class PesPacket { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_H_ diff --git a/packager/media/formats/mp2t/pes_packet_generator.cc b/packager/media/formats/mp2t/pes_packet_generator.cc index bdbf5b9ae8..6e46703aa1 100644 --- a/packager/media/formats/mp2t/pes_packet_generator.cc +++ b/packager/media/formats/mp2t/pes_packet_generator.cc @@ -20,7 +20,7 @@ #include "packager/media/formats/mp2t/pes_packet.h" #include "packager/media/formats/mp4/aac_audio_specific_config.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -220,4 +220,4 @@ bool PesPacketGenerator::Flush() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/pes_packet_generator.h b/packager/media/formats/mp2t/pes_packet_generator.h index 417f0b998c..05f9e29d9e 100644 --- a/packager/media/formats/mp2t/pes_packet_generator.h +++ b/packager/media/formats/mp2t/pes_packet_generator.h @@ -16,7 +16,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/base/stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { class NalUnitToByteStreamConverter; @@ -96,6 +96,6 @@ class PesPacketGenerator { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_GENERATOR_H_ diff --git a/packager/media/formats/mp2t/pes_packet_generator_unittest.cc b/packager/media/formats/mp2t/pes_packet_generator_unittest.cc index 80cd6cc228..611cf7c894 100644 --- a/packager/media/formats/mp2t/pes_packet_generator_unittest.cc +++ b/packager/media/formats/mp2t/pes_packet_generator_unittest.cc @@ -16,7 +16,7 @@ #include "packager/media/formats/mp2t/pes_packet_generator.h" #include "packager/media/formats/mp4/aac_audio_specific_config.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -724,4 +724,4 @@ TEST_F(PesPacketGeneratorTest, AacSampleEncryptionLastBytesAreEncrypted) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/program_map_table_writer.cc b/packager/media/formats/mp2t/program_map_table_writer.cc index 6f40874c34..c08bf74e9a 100644 --- a/packager/media/formats/mp2t/program_map_table_writer.cc +++ b/packager/media/formats/mp2t/program_map_table_writer.cc @@ -15,7 +15,7 @@ #include "packager/media/formats/mp2t/ts_packet_writer_util.h" #include "packager/media/formats/mp4/aac_audio_specific_config.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -409,4 +409,4 @@ bool AacProgramMapTableWriter::EncryptedSegmentPmtWithParameters( } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/program_map_table_writer.h b/packager/media/formats/mp2t/program_map_table_writer.h index 6a162f3632..1be6b3f77a 100644 --- a/packager/media/formats/mp2t/program_map_table_writer.h +++ b/packager/media/formats/mp2t/program_map_table_writer.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -95,6 +95,6 @@ class AacProgramMapTableWriter : public ProgramMapTableWriter { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_PROGRAM_MAP_TABLE_WRITER_H_ diff --git a/packager/media/formats/mp2t/program_map_table_writer_unittest.cc b/packager/media/formats/mp2t/program_map_table_writer_unittest.cc index 9eb0f78e87..8197124d48 100644 --- a/packager/media/formats/mp2t/program_map_table_writer_unittest.cc +++ b/packager/media/formats/mp2t/program_map_table_writer_unittest.cc @@ -12,7 +12,7 @@ #include "packager/media/formats/mp2t/continuity_counter.h" #include "packager/media/formats/mp2t/program_map_table_writer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -399,4 +399,4 @@ TEST_F(ProgramMapTableWriterTest, EncryptedSegmentsAacPmt) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_muxer.cc b/packager/media/formats/mp2t/ts_muxer.cc index 2fa1ad4a1e..1951d76ca1 100644 --- a/packager/media/formats/mp2t/ts_muxer.cc +++ b/packager/media/formats/mp2t/ts_muxer.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/mp2t/ts_muxer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -60,4 +60,4 @@ void TsMuxer::FireOnMediaEndEvent() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_muxer.h b/packager/media/formats/mp2t/ts_muxer.h index 3ac9bfa9d2..ce62cb66aa 100644 --- a/packager/media/formats/mp2t/ts_muxer.h +++ b/packager/media/formats/mp2t/ts_muxer.h @@ -11,7 +11,7 @@ #include "packager/media/base/muxer.h" #include "packager/media/formats/mp2t/ts_segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -39,6 +39,6 @@ class TsMuxer : public Muxer { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_TS_MUXER_H_ diff --git a/packager/media/formats/mp2t/ts_packet.cc b/packager/media/formats/mp2t/ts_packet.cc index c4319408eb..3e0d918419 100644 --- a/packager/media/formats/mp2t/ts_packet.cc +++ b/packager/media/formats/mp2t/ts_packet.cc @@ -8,7 +8,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -211,4 +211,4 @@ bool TsPacket::ParseAdaptationField(BitReader* bit_reader, } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h index baf345adec..7874af2eaf 100644 --- a/packager/media/formats/mp2t/ts_packet.h +++ b/packager/media/formats/mp2t/ts_packet.h @@ -9,7 +9,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { class BitReader; @@ -71,7 +71,7 @@ class TsPacket { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.cc b/packager/media/formats/mp2t/ts_packet_writer_util.cc index 2be98bd6a5..f6d7e4347f 100644 --- a/packager/media/formats/mp2t/ts_packet_writer_util.cc +++ b/packager/media/formats/mp2t/ts_packet_writer_util.cc @@ -10,7 +10,7 @@ #include "packager/media/base/buffer_writer.h" #include "packager/media/formats/mp2t/continuity_counter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -162,4 +162,4 @@ void WritePayloadToBufferWriter(const uint8_t* payload, } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.h b/packager/media/formats/mp2t/ts_packet_writer_util.h index ca92c76dc9..dfb3178f5d 100644 --- a/packager/media/formats/mp2t/ts_packet_writer_util.h +++ b/packager/media/formats/mp2t/ts_packet_writer_util.h @@ -12,7 +12,7 @@ #include #include -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -42,6 +42,6 @@ void WritePayloadToBufferWriter(const uint8_t* payload, } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_TS_WRITER_UTIL_H_ diff --git a/packager/media/formats/mp2t/ts_section.h b/packager/media/formats/mp2t/ts_section.h index 160f6e70f4..2bd06c9b84 100644 --- a/packager/media/formats/mp2t/ts_section.h +++ b/packager/media/formats/mp2t/ts_section.h @@ -5,7 +5,7 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_H_ -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -38,6 +38,6 @@ class TsSection { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_section_pat.cc b/packager/media/formats/mp2t/ts_section_pat.cc index 29e29e19c4..81e1d81f4a 100644 --- a/packager/media/formats/mp2t/ts_section_pat.cc +++ b/packager/media/formats/mp2t/ts_section_pat.cc @@ -10,7 +10,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -120,5 +120,5 @@ void TsSectionPat::ResetPsiSection() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h index 4b435206c8..38e08be6c3 100644 --- a/packager/media/formats/mp2t/ts_section_pat.h +++ b/packager/media/formats/mp2t/ts_section_pat.h @@ -9,7 +9,7 @@ #include "packager/base/compiler_specific.h" #include "packager/media/formats/mp2t/ts_section_psi.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -36,7 +36,7 @@ class TsSectionPat : public TsSectionPsi { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_section_pes.cc b/packager/media/formats/mp2t/ts_section_pes.cc index 92c72e2c1e..8ec595010f 100644 --- a/packager/media/formats/mp2t/ts_section_pes.cc +++ b/packager/media/formats/mp2t/ts_section_pes.cc @@ -78,7 +78,7 @@ static int64_t ConvertTimestampSectionToTimestamp(int64_t timestamp_section) { (((timestamp_section >> 1) & 0x7fff) << 0); } -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -309,4 +309,4 @@ void TsSectionPes::ResetPesState() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h index 3216349715..40f5b21c69 100644 --- a/packager/media/formats/mp2t/ts_section_pes.h +++ b/packager/media/formats/mp2t/ts_section_pes.h @@ -12,7 +12,7 @@ #include "packager/media/base/byte_queue.h" #include "packager/media/formats/mp2t/ts_section.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -62,7 +62,7 @@ class TsSectionPes : public TsSection { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_section_pmt.cc b/packager/media/formats/mp2t/ts_section_pmt.cc index b32a303e96..ee145083f6 100644 --- a/packager/media/formats/mp2t/ts_section_pmt.cc +++ b/packager/media/formats/mp2t/ts_section_pmt.cc @@ -10,7 +10,7 @@ #include "packager/media/base/bit_reader.h" #include "packager/media/formats/mp2t/mp2t_common.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -114,4 +114,4 @@ void TsSectionPmt::ResetPsiSection() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h index 301b51f39d..cf226f3679 100644 --- a/packager/media/formats/mp2t/ts_section_pmt.h +++ b/packager/media/formats/mp2t/ts_section_pmt.h @@ -9,7 +9,7 @@ #include "packager/base/compiler_specific.h" #include "packager/media/formats/mp2t/ts_section_psi.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -35,6 +35,6 @@ class TsSectionPmt : public TsSectionPsi { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_section_psi.cc b/packager/media/formats/mp2t/ts_section_psi.cc index cfaeb1468e..2e9eb9bd7b 100644 --- a/packager/media/formats/mp2t/ts_section_psi.cc +++ b/packager/media/formats/mp2t/ts_section_psi.cc @@ -35,7 +35,7 @@ static bool IsCrcValid(const uint8_t* buf, int size) { return (crc == 0); } -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -132,4 +132,4 @@ void TsSectionPsi::ResetPsiState() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_section_psi.h b/packager/media/formats/mp2t/ts_section_psi.h index 865c4e3747..cffa01d911 100644 --- a/packager/media/formats/mp2t/ts_section_psi.h +++ b/packager/media/formats/mp2t/ts_section_psi.h @@ -9,7 +9,7 @@ #include "packager/media/base/byte_queue.h" #include "packager/media/formats/mp2t/ts_section.h" -namespace edash_packager { +namespace shaka { namespace media { class BitReader; @@ -51,7 +51,7 @@ class TsSectionPsi : public TsSection { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif diff --git a/packager/media/formats/mp2t/ts_segmenter.cc b/packager/media/formats/mp2t/ts_segmenter.cc index 17470bf95a..5c908a1915 100644 --- a/packager/media/formats/mp2t/ts_segmenter.cc +++ b/packager/media/formats/mp2t/ts_segmenter.cc @@ -16,7 +16,7 @@ #include "packager/media/event/muxer_listener.h" #include "packager/media/event/progress_listener.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -191,4 +191,4 @@ Status TsSegmenter::NotifyEncrypted() { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_segmenter.h b/packager/media/formats/mp2t/ts_segmenter.h index 167eb1d201..b554f79eb9 100644 --- a/packager/media/formats/mp2t/ts_segmenter.h +++ b/packager/media/formats/mp2t/ts_segmenter.h @@ -15,7 +15,7 @@ #include "packager/media/formats/mp2t/pes_packet_generator.h" #include "packager/media/formats/mp2t/ts_writer.h" -namespace edash_packager { +namespace shaka { namespace media { class KeySource; @@ -119,5 +119,5 @@ class TsSegmenter { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_TS_SEGMENTER_H_ diff --git a/packager/media/formats/mp2t/ts_segmenter_unittest.cc b/packager/media/formats/mp2t/ts_segmenter_unittest.cc index 19ba5cf846..b346505230 100644 --- a/packager/media/formats/mp2t/ts_segmenter_unittest.cc +++ b/packager/media/formats/mp2t/ts_segmenter_unittest.cc @@ -14,7 +14,7 @@ #include "packager/media/event/mock_muxer_listener.h" #include "packager/media/formats/mp2t/ts_segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -584,4 +584,4 @@ TEST_F(TsSegmenterTest, WithEncryptionWithClearLead) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_writer.cc b/packager/media/formats/mp2t/ts_writer.cc index c126583d70..8082e4003f 100644 --- a/packager/media/formats/mp2t/ts_writer.cc +++ b/packager/media/formats/mp2t/ts_writer.cc @@ -15,7 +15,7 @@ #include "packager/media/base/video_stream_info.h" #include "packager/media/formats/mp2t/ts_packet_writer_util.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -260,4 +260,4 @@ void TsWriter::SetProgramMapTableWriterForTesting( } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp2t/ts_writer.h b/packager/media/formats/mp2t/ts_writer.h index 7bd31673fc..07197ee8ab 100644 --- a/packager/media/formats/mp2t/ts_writer.h +++ b/packager/media/formats/mp2t/ts_writer.h @@ -19,7 +19,7 @@ #include "packager/media/formats/mp2t/pes_packet.h" #include "packager/media/formats/mp2t/program_map_table_writer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -83,6 +83,6 @@ class TsWriter { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // PACKAGER_MEDIA_FORMATS_MP2T_TS_WRITER_H_ diff --git a/packager/media/formats/mp2t/ts_writer_unittest.cc b/packager/media/formats/mp2t/ts_writer_unittest.cc index ceb51e8333..123956c04d 100644 --- a/packager/media/formats/mp2t/ts_writer_unittest.cc +++ b/packager/media/formats/mp2t/ts_writer_unittest.cc @@ -19,7 +19,7 @@ using ::testing::InSequence; using ::testing::Return; using ::testing::_; -namespace edash_packager { +namespace shaka { namespace media { namespace mp2t { @@ -606,4 +606,4 @@ TEST_F(TsWriterTest, TsPacketPayload183Bytes) { } // namespace mp2t } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/aac_audio_specific_config.cc b/packager/media/formats/mp4/aac_audio_specific_config.cc index f370b9d97b..72d59f1781 100644 --- a/packager/media/formats/mp4/aac_audio_specific_config.cc +++ b/packager/media/formats/mp4/aac_audio_specific_config.cc @@ -22,7 +22,7 @@ const uint8_t kChannelConfigs[] = {0, 1, 2, 3, 4, 5, 6, 8}; } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -263,4 +263,4 @@ bool AACAudioSpecificConfig::SkipGASpecificConfig(BitReader* bit_reader) const { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/aac_audio_specific_config.h b/packager/media/formats/mp4/aac_audio_specific_config.h index d40f061d25..d249f55a48 100644 --- a/packager/media/formats/mp4/aac_audio_specific_config.h +++ b/packager/media/formats/mp4/aac_audio_specific_config.h @@ -10,7 +10,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { class BitReader; @@ -87,6 +87,6 @@ class AACAudioSpecificConfig { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_ diff --git a/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc b/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc index c0c359e387..77b0a8bf87 100644 --- a/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc +++ b/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/mp4/aac_audio_specific_config.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -143,4 +143,4 @@ TEST(AACAudioSpecificConfigTest, IncorrectChannelTest) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/box.cc b/packager/media/formats/mp4/box.cc index 2771887081..6b07389ed7 100644 --- a/packager/media/formats/mp4/box.cc +++ b/packager/media/formats/mp4/box.cc @@ -9,7 +9,7 @@ #include "packager/base/logging.h" #include "packager/media/formats/mp4/box_buffer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -94,4 +94,4 @@ bool FullBox::ReadWriteHeaderInternal(BoxBuffer* buffer) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/box.h b/packager/media/formats/mp4/box.h index f996498d40..5a048541f4 100644 --- a/packager/media/formats/mp4/box.h +++ b/packager/media/formats/mp4/box.h @@ -11,7 +11,7 @@ #include "packager/media/base/fourccs.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -99,6 +99,6 @@ struct FullBox : Box { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_BOX_H_ diff --git a/packager/media/formats/mp4/box_buffer.h b/packager/media/formats/mp4/box_buffer.h index bd4345e499..59af585f0d 100644 --- a/packager/media/formats/mp4/box_buffer.h +++ b/packager/media/formats/mp4/box_buffer.h @@ -14,7 +14,7 @@ #include "packager/media/formats/mp4/box.h" #include "packager/media/formats/mp4/box_reader.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -208,6 +208,6 @@ class BoxBuffer { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_BOX_BUFFER_H_ diff --git a/packager/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc index 99255d1672..861167b020 100644 --- a/packager/media/formats/mp4/box_definitions.cc +++ b/packager/media/formats/mp4/box_definitions.cc @@ -94,7 +94,7 @@ bool IsFitIn32Bits(T1 a1, T2 a2, T3 a3) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -2690,4 +2690,4 @@ uint32_t VTTCueBox::ComputeSizeInternal() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/box_definitions.h b/packager/media/formats/mp4/box_definitions.h index c1e3aef04d..79470f0713 100644 --- a/packager/media/formats/mp4/box_definitions.h +++ b/packager/media/formats/mp4/box_definitions.h @@ -13,7 +13,7 @@ #include "packager/media/formats/mp4/box.h" #include "packager/media/formats/mp4/es_descriptor.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferReader; @@ -826,6 +826,6 @@ struct VTTCueBox : Box { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ diff --git a/packager/media/formats/mp4/box_definitions_comparison.h b/packager/media/formats/mp4/box_definitions_comparison.h index dba15341e1..83864aad8c 100644 --- a/packager/media/formats/mp4/box_definitions_comparison.h +++ b/packager/media/formats/mp4/box_definitions_comparison.h @@ -11,7 +11,7 @@ #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { inline bool operator==(const SubsampleEntry& lhs, const SubsampleEntry& rhs) { @@ -497,6 +497,6 @@ inline bool operator==(const VTTCueBox& lhs, } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_ diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc index d29f552f35..125663a237 100644 --- a/packager/media/formats/mp4/box_definitions_unittest.cc +++ b/packager/media/formats/mp4/box_definitions_unittest.cc @@ -15,7 +15,7 @@ #include "packager/media/formats/mp4/box_definitions_comparison.h" #include "packager/media/formats/mp4/box_reader.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { namespace { @@ -1301,4 +1301,4 @@ TEST_F(BoxDefinitionsTest, SampleEncryptionWithIvUnknownWhenReading) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/box_reader.cc b/packager/media/formats/mp4/box_reader.cc index 8195468cae..525e8ec725 100644 --- a/packager/media/formats/mp4/box_reader.cc +++ b/packager/media/formats/mp4/box_reader.cc @@ -13,7 +13,7 @@ #include "packager/base/strings/stringprintf.h" #include "packager/media/formats/mp4/box.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -190,4 +190,4 @@ bool BoxReader::ReadHeader(bool* err) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h index ce4a4e9121..7d0d112f83 100644 --- a/packager/media/formats/mp4/box_reader.h +++ b/packager/media/formats/mp4/box_reader.h @@ -14,7 +14,7 @@ #include "packager/media/base/fourccs.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -181,6 +181,6 @@ bool BoxReader::ReadAllChildren(std::vector* children) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_BOX_READER_H_ diff --git a/packager/media/formats/mp4/box_reader_unittest.cc b/packager/media/formats/mp4/box_reader_unittest.cc index aaeb240f43..10371a8528 100644 --- a/packager/media/formats/mp4/box_reader_unittest.cc +++ b/packager/media/formats/mp4/box_reader_unittest.cc @@ -11,7 +11,7 @@ #include "packager/media/base/rcheck.h" #include "packager/media/formats/mp4/box_buffer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -213,4 +213,4 @@ TEST_F(BoxReaderTest, SkippingBloc) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/chunk_info_iterator.cc b/packager/media/formats/mp4/chunk_info_iterator.cc index ab175f8da1..f362611ea0 100644 --- a/packager/media/formats/mp4/chunk_info_iterator.cc +++ b/packager/media/formats/mp4/chunk_info_iterator.cc @@ -11,7 +11,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -72,4 +72,4 @@ uint32_t ChunkInfoIterator::NumSamples(uint32_t start_chunk, } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h index 6d0f33473a..04eeb9b8ae 100644 --- a/packager/media/formats/mp4/chunk_info_iterator.h +++ b/packager/media/formats/mp4/chunk_info_iterator.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -70,6 +70,6 @@ class ChunkInfoIterator { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_ diff --git a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc index 387a532a41..a33deabd5b 100644 --- a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc +++ b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc @@ -17,7 +17,7 @@ struct ChunkProperty { }; } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -111,4 +111,4 @@ TEST_F(ChunkInfoIteratorTest, AdvanceSample) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/composition_offset_iterator.cc b/packager/media/formats/mp4/composition_offset_iterator.cc index c9b5582a16..1b0cc11a23 100644 --- a/packager/media/formats/mp4/composition_offset_iterator.cc +++ b/packager/media/formats/mp4/composition_offset_iterator.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -60,4 +60,4 @@ uint32_t CompositionOffsetIterator::NumSamples() const { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h index 0e9453399f..413b32e1ea 100644 --- a/packager/media/formats/mp4/composition_offset_iterator.h +++ b/packager/media/formats/mp4/composition_offset_iterator.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -55,6 +55,6 @@ class CompositionOffsetIterator { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_ diff --git a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc index 08de2db94f..abb36a88f9 100644 --- a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc +++ b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/mp4/composition_offset_iterator.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -79,4 +79,4 @@ TEST_F(CompositionOffsetIteratorTest, SampleOffset) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/decoding_time_iterator.cc b/packager/media/formats/mp4/decoding_time_iterator.cc index 214aad883b..e76f9bc92b 100644 --- a/packager/media/formats/mp4/decoding_time_iterator.cc +++ b/packager/media/formats/mp4/decoding_time_iterator.cc @@ -10,7 +10,7 @@ #include "packager/base/logging.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -69,4 +69,4 @@ uint32_t DecodingTimeIterator::NumSamples() const { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h index f23c9f3e8e..3c02bcfb0e 100644 --- a/packager/media/formats/mp4/decoding_time_iterator.h +++ b/packager/media/formats/mp4/decoding_time_iterator.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -55,6 +55,6 @@ class DecodingTimeIterator { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_ diff --git a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc index c85c5e1e15..996e5a03f8 100644 --- a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc +++ b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/mp4/decoding_time_iterator.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -79,4 +79,4 @@ TEST_F(DecodingTimeIteratorTest, Duration) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/encrypting_fragmenter.cc b/packager/media/formats/mp4/encrypting_fragmenter.cc index 84b1e52ed8..afc654eea3 100644 --- a/packager/media/formats/mp4/encrypting_fragmenter.cc +++ b/packager/media/formats/mp4/encrypting_fragmenter.cc @@ -18,7 +18,7 @@ #include "packager/media/filters/vp9_parser.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -352,4 +352,4 @@ bool EncryptingFragmenter::IsSubsampleEncryptionRequired() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/encrypting_fragmenter.h b/packager/media/formats/mp4/encrypting_fragmenter.h index efa57b590a..489b097a5a 100644 --- a/packager/media/formats/mp4/encrypting_fragmenter.h +++ b/packager/media/formats/mp4/encrypting_fragmenter.h @@ -14,7 +14,7 @@ #include "packager/media/formats/mp4/fragmenter.h" #include "packager/media/formats/mp4/video_slice_header_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class AesCryptor; @@ -104,6 +104,6 @@ class EncryptingFragmenter : public Fragmenter { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_ENCRYPTING_FRAGMENTER_H_ diff --git a/packager/media/formats/mp4/es_descriptor.cc b/packager/media/formats/mp4/es_descriptor.cc index afa042a905..a43172a93e 100644 --- a/packager/media/formats/mp4/es_descriptor.cc +++ b/packager/media/formats/mp4/es_descriptor.cc @@ -8,7 +8,7 @@ #include "packager/media/base/buffer_writer.h" #include "packager/media/base/rcheck.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -193,4 +193,4 @@ size_t ESDescriptor::ComputeSize() const { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/es_descriptor.h b/packager/media/formats/mp4/es_descriptor.h index abde0c90d6..a037a9efab 100644 --- a/packager/media/formats/mp4/es_descriptor.h +++ b/packager/media/formats/mp4/es_descriptor.h @@ -10,7 +10,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { class BitReader; @@ -93,6 +93,6 @@ class ESDescriptor { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ diff --git a/packager/media/formats/mp4/es_descriptor_unittest.cc b/packager/media/formats/mp4/es_descriptor_unittest.cc index 597baf76de..415629d1e1 100644 --- a/packager/media/formats/mp4/es_descriptor_unittest.cc +++ b/packager/media/formats/mp4/es_descriptor_unittest.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/mp4/es_descriptor.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -79,4 +79,4 @@ TEST(ESDescriptorTest, FiveByteLengthTest) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc index b4f4800635..25fe920de2 100644 --- a/packager/media/formats/mp4/fragmenter.cc +++ b/packager/media/formats/mp4/fragmenter.cc @@ -13,7 +13,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -188,4 +188,4 @@ bool Fragmenter::StartsWithSAP() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h index 10e0fdec46..19548f9b87 100644 --- a/packager/media/formats/mp4/fragmenter.h +++ b/packager/media/formats/mp4/fragmenter.h @@ -14,7 +14,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/status.h" -namespace edash_packager { +namespace shaka { namespace media { class BufferWriter; @@ -109,6 +109,6 @@ bool Fragmenter::OptimizeSampleEntries(std::vector* entries, } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_FRAGMENTER_H_ diff --git a/packager/media/formats/mp4/key_rotation_fragmenter.cc b/packager/media/formats/mp4/key_rotation_fragmenter.cc index 6dbb677b24..f8eea8be8a 100644 --- a/packager/media/formats/mp4/key_rotation_fragmenter.cc +++ b/packager/media/formats/mp4/key_rotation_fragmenter.cc @@ -9,7 +9,7 @@ #include "packager/media/base/aes_encryptor.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -133,4 +133,4 @@ Status KeyRotationFragmenter::PrepareFragmentForEncryption( } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/key_rotation_fragmenter.h b/packager/media/formats/mp4/key_rotation_fragmenter.h index 88f5162417..00731c6c24 100644 --- a/packager/media/formats/mp4/key_rotation_fragmenter.h +++ b/packager/media/formats/mp4/key_rotation_fragmenter.h @@ -12,7 +12,7 @@ #include "packager/media/event/muxer_listener.h" #include "packager/media/formats/mp4/encrypting_fragmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -76,6 +76,6 @@ class KeyRotationFragmenter : public EncryptingFragmenter { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_KEY_ROTATION_FRAGMENTER_H_ diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc index a3a9f9ef88..a14c828dff 100644 --- a/packager/media/formats/mp4/mp4_media_parser.cc +++ b/packager/media/formats/mp4/mp4_media_parser.cc @@ -29,7 +29,7 @@ #include "packager/media/formats/mp4/es_descriptor.h" #include "packager/media/formats/mp4/track_run_iterator.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { namespace { @@ -763,4 +763,4 @@ void MP4MediaParser::ChangeState(State new_state) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h index 9a9cf9c0e3..46f36b6636 100644 --- a/packager/media/formats/mp4/mp4_media_parser.h +++ b/packager/media/formats/mp4/mp4_media_parser.h @@ -21,7 +21,7 @@ #include "packager/media/base/media_parser.h" #include "packager/media/base/offset_byte_queue.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -109,6 +109,6 @@ class MP4MediaParser : public MediaParser { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_ diff --git a/packager/media/formats/mp4/mp4_media_parser_unittest.cc b/packager/media/formats/mp4/mp4_media_parser_unittest.cc index 0244cc9428..f9963910e8 100644 --- a/packager/media/formats/mp4/mp4_media_parser_unittest.cc +++ b/packager/media/formats/mp4/mp4_media_parser_unittest.cc @@ -21,7 +21,7 @@ using ::testing::DoAll; using ::testing::Return; using ::testing::SetArgPointee; -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -283,4 +283,4 @@ TEST_F(MP4MediaParserTest, CencWithDecryptionSourceAndSenc) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index 172ac663b4..10ce71262b 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -22,7 +22,7 @@ #include "packager/media/formats/mp4/multi_segment_segmenter.h" #include "packager/media/formats/mp4/single_segment_segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -409,4 +409,4 @@ uint64_t MP4Muxer::IsoTimeNow() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h index ba250479ef..cd71d9e8d4 100644 --- a/packager/media/formats/mp4/mp4_muxer.h +++ b/packager/media/formats/mp4/mp4_muxer.h @@ -11,7 +11,7 @@ #include "packager/media/base/muxer.h" -namespace edash_packager { +namespace shaka { namespace media { class AudioStreamInfo; @@ -71,6 +71,6 @@ class MP4Muxer : public Muxer { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_MP4_MUXER_H_ diff --git a/packager/media/formats/mp4/multi_segment_segmenter.cc b/packager/media/formats/mp4/multi_segment_segmenter.cc index d7a4db7473..b7f146f2b6 100644 --- a/packager/media/formats/mp4/multi_segment_segmenter.cc +++ b/packager/media/formats/mp4/multi_segment_segmenter.cc @@ -16,7 +16,7 @@ #include "packager/media/file/file.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -195,4 +195,4 @@ Status MultiSegmentSegmenter::WriteSegment() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/multi_segment_segmenter.h b/packager/media/formats/mp4/multi_segment_segmenter.h index 35fde15d2e..802629350d 100644 --- a/packager/media/formats/mp4/multi_segment_segmenter.h +++ b/packager/media/formats/mp4/multi_segment_segmenter.h @@ -9,7 +9,7 @@ #include "packager/media/formats/mp4/segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -58,6 +58,6 @@ class MultiSegmentSegmenter : public Segmenter { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_ diff --git a/packager/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc index 6982e6da26..fbb7a32516 100644 --- a/packager/media/formats/mp4/segmenter.cc +++ b/packager/media/formats/mp4/segmenter.cc @@ -23,7 +23,7 @@ #include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/key_rotation_fragmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -466,4 +466,4 @@ Status Segmenter::FinalizeFragment(bool finalize_segment, } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h index f346c8d4cb..21471af289 100644 --- a/packager/media/formats/mp4/segmenter.h +++ b/packager/media/formats/mp4/segmenter.h @@ -16,7 +16,7 @@ #include "packager/media/base/status.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -149,6 +149,6 @@ class Segmenter { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_SEGMENTER_H_ diff --git a/packager/media/formats/mp4/single_segment_segmenter.cc b/packager/media/formats/mp4/single_segment_segmenter.cc index 5b8483b19b..0d166ed322 100644 --- a/packager/media/formats/mp4/single_segment_segmenter.cc +++ b/packager/media/formats/mp4/single_segment_segmenter.cc @@ -22,7 +22,7 @@ #include "packager/media/file/file.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { namespace { @@ -235,4 +235,4 @@ Status SingleSegmentSegmenter::DoFinalizeSegment() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/single_segment_segmenter.h b/packager/media/formats/mp4/single_segment_segmenter.h index c01d32b6e7..301bd1cf58 100644 --- a/packager/media/formats/mp4/single_segment_segmenter.h +++ b/packager/media/formats/mp4/single_segment_segmenter.h @@ -10,7 +10,7 @@ #include "packager/media/file/file_closer.h" #include "packager/media/formats/mp4/segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -53,6 +53,6 @@ class SingleSegmentSegmenter : public Segmenter { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_ diff --git a/packager/media/formats/mp4/sync_sample_iterator.cc b/packager/media/formats/mp4/sync_sample_iterator.cc index 120de0a1b5..b2c3b9200f 100644 --- a/packager/media/formats/mp4/sync_sample_iterator.cc +++ b/packager/media/formats/mp4/sync_sample_iterator.cc @@ -8,7 +8,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -43,4 +43,4 @@ bool SyncSampleIterator::IsSyncSample(uint32_t sample) const { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h index c23ab0ba55..a2fc5f76dc 100644 --- a/packager/media/formats/mp4/sync_sample_iterator.h +++ b/packager/media/formats/mp4/sync_sample_iterator.h @@ -14,7 +14,7 @@ #include "packager/base/macros.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -47,6 +47,6 @@ class SyncSampleIterator { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_ diff --git a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc index 673610264f..266a015eb8 100644 --- a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc +++ b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc @@ -22,7 +22,7 @@ bool InSyncSamples(uint32_t sample) { } } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -58,4 +58,4 @@ TEST(SyncSampleIteratorTest, SyncSample) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc index 86e1597d87..e745fba0d0 100644 --- a/packager/media/formats/mp4/track_run_iterator.cc +++ b/packager/media/formats/mp4/track_run_iterator.cc @@ -19,7 +19,7 @@ namespace { const int64_t kInvalidOffset = std::numeric_limits::max(); } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -626,4 +626,4 @@ scoped_ptr TrackRunIterator::GetDecryptConfig() { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h index d4335dd695..81d1fadd73 100644 --- a/packager/media/formats/mp4/track_run_iterator.h +++ b/packager/media/formats/mp4/track_run_iterator.h @@ -10,7 +10,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/mp4/box_definitions.h" -namespace edash_packager { +namespace shaka { namespace media { class DecryptConfig; @@ -122,6 +122,6 @@ class TrackRunIterator { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_ diff --git a/packager/media/formats/mp4/track_run_iterator_unittest.cc b/packager/media/formats/mp4/track_run_iterator_unittest.cc index 855d918487..75acee32c1 100644 --- a/packager/media/formats/mp4/track_run_iterator_unittest.cc +++ b/packager/media/formats/mp4/track_run_iterator_unittest.cc @@ -94,7 +94,7 @@ const uint8_t kKeyId[] = { } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -699,4 +699,4 @@ TEST_F(TrackRunIteratorTest, UnexpectedOrderingTest) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/video_slice_header_parser.cc b/packager/media/formats/mp4/video_slice_header_parser.cc index e8a256a5a9..d85964249f 100644 --- a/packager/media/formats/mp4/video_slice_header_parser.cc +++ b/packager/media/formats/mp4/video_slice_header_parser.cc @@ -10,7 +10,7 @@ #include "packager/media/filters/avc_decoder_configuration.h" #include "packager/media/filters/hevc_decoder_configuration.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -92,5 +92,5 @@ int64_t H265VideoSliceHeaderParser::GetHeaderSize(const Nalu& nalu) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mp4/video_slice_header_parser.h b/packager/media/formats/mp4/video_slice_header_parser.h index 01a0db06fc..a4675a8292 100644 --- a/packager/media/formats/mp4/video_slice_header_parser.h +++ b/packager/media/formats/mp4/video_slice_header_parser.h @@ -13,7 +13,7 @@ #include "packager/media/filters/h264_parser.h" #include "packager/media/filters/h265_parser.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -70,7 +70,7 @@ class H265VideoSliceHeaderParser : public VideoSliceHeaderParser { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MP4_VIDEO_SLICE_HEADER_PARSER_H_ diff --git a/packager/media/formats/mp4/video_slice_header_parser_unittest.cc b/packager/media/formats/mp4/video_slice_header_parser_unittest.cc index 78613f68f2..99ef6015af 100644 --- a/packager/media/formats/mp4/video_slice_header_parser_unittest.cc +++ b/packager/media/formats/mp4/video_slice_header_parser_unittest.cc @@ -8,7 +8,7 @@ #include "packager/media/formats/mp4/video_slice_header_parser.h" -namespace edash_packager { +namespace shaka { namespace media { namespace mp4 { @@ -154,4 +154,4 @@ TEST(H264VideoSliceHeaderParserTest, ErrorsForEOSWithinEntry) { } // namespace mp4 } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mpeg/adts_constants.cc b/packager/media/formats/mpeg/adts_constants.cc index d1b816b07f..82d13a66a5 100644 --- a/packager/media/formats/mpeg/adts_constants.cc +++ b/packager/media/formats/mpeg/adts_constants.cc @@ -6,7 +6,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { // The following conversion table is extracted from ISO 14496 Part 3 - @@ -23,4 +23,4 @@ const int kAdtsNumChannelsTable[] = { const size_t kAdtsNumChannelsTableSize = arraysize(kAdtsNumChannelsTable); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/mpeg/adts_constants.h b/packager/media/formats/mpeg/adts_constants.h index 98095ac6e3..a929484bc0 100644 --- a/packager/media/formats/mpeg/adts_constants.h +++ b/packager/media/formats/mpeg/adts_constants.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { enum { @@ -22,6 +22,6 @@ extern const int kAdtsNumChannelsTable[]; extern const size_t kAdtsNumChannelsTableSize; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_MPEG_ADTS_CONSTANTS_H_ diff --git a/packager/media/formats/webm/cluster_builder.cc b/packager/media/formats/webm/cluster_builder.cc index 7b25e8b091..9921724170 100644 --- a/packager/media/formats/webm/cluster_builder.cc +++ b/packager/media/formats/webm/cluster_builder.cc @@ -7,7 +7,7 @@ #include "packager/base/logging.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { static const uint8_t kClusterHeader[] = { @@ -237,4 +237,4 @@ void ClusterBuilder::UpdateUInt64(int offset, int64_t value) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/cluster_builder.h b/packager/media/formats/webm/cluster_builder.h index bd0b4a8fa1..7cd3bbbcdc 100644 --- a/packager/media/formats/webm/cluster_builder.h +++ b/packager/media/formats/webm/cluster_builder.h @@ -8,7 +8,7 @@ #include #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { class Cluster { @@ -79,6 +79,6 @@ class ClusterBuilder { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_ diff --git a/packager/media/formats/webm/encrypted_segmenter_unittest.cc b/packager/media/formats/webm/encrypted_segmenter_unittest.cc index cf04ec6b9b..dd15efbc08 100644 --- a/packager/media/formats/webm/encrypted_segmenter_unittest.cc +++ b/packager/media/formats/webm/encrypted_segmenter_unittest.cc @@ -11,7 +11,7 @@ #include "packager/media/base/fixed_key_source.h" #include "packager/media/formats/webm/segmenter_test_base.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -228,5 +228,5 @@ TEST_F(EncrypedSegmenterTest, BasicSupport) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/encryptor.cc b/packager/media/formats/webm/encryptor.cc index 58aa85f31e..a23cf563cf 100644 --- a/packager/media/formats/webm/encryptor.cc +++ b/packager/media/formats/webm/encryptor.cc @@ -10,7 +10,7 @@ #include "packager/media/base/fourccs.h" #include "packager/media/base/media_sample.h" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { namespace { @@ -130,4 +130,4 @@ Status Encryptor::CreateEncryptor(MuxerListener* muxer_listener, } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/encryptor.h b/packager/media/formats/webm/encryptor.h index b479c8ff65..051045f5b1 100644 --- a/packager/media/formats/webm/encryptor.h +++ b/packager/media/formats/webm/encryptor.h @@ -14,7 +14,7 @@ #include "packager/media/event/muxer_listener.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { class AesCtrEncryptor; @@ -59,6 +59,6 @@ class Encryptor { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_ENCRYPTOR_H_ diff --git a/packager/media/formats/webm/mkv_writer.cc b/packager/media/formats/webm/mkv_writer.cc index 0918388096..256284d236 100644 --- a/packager/media/formats/webm/mkv_writer.cc +++ b/packager/media/formats/webm/mkv_writer.cc @@ -6,7 +6,7 @@ #include "packager/media/formats/webm/mkv_writer.h" -namespace edash_packager { +namespace shaka { namespace media { MkvWriter::MkvWriter() : position_(0) {} @@ -91,4 +91,4 @@ void MkvWriter::ElementStartNotify(mkvmuxer::uint64 element_id, mkvmuxer::int64 position) {} } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/mkv_writer.h b/packager/media/formats/webm/mkv_writer.h index 9371cfb348..aaaae56c0e 100644 --- a/packager/media/formats/webm/mkv_writer.h +++ b/packager/media/formats/webm/mkv_writer.h @@ -14,7 +14,7 @@ #include "packager/media/file/file_closer.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { /// An implementation of IMkvWriter using our File type. @@ -70,6 +70,6 @@ class MkvWriter : public mkvmuxer::IMkvWriter { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_MKV_WRITER_H_ diff --git a/packager/media/formats/webm/multi_segment_segmenter.cc b/packager/media/formats/webm/multi_segment_segmenter.cc index b361bf9151..d36e01b523 100644 --- a/packager/media/formats/webm/multi_segment_segmenter.cc +++ b/packager/media/formats/webm/multi_segment_segmenter.cc @@ -13,7 +13,7 @@ #include "packager/media/event/muxer_listener.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { MultiSegmentSegmenter::MultiSegmentSegmenter(const MuxerOptions& options) @@ -91,4 +91,4 @@ Status MultiSegmentSegmenter::NewSegment(uint64_t start_timescale) { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/multi_segment_segmenter.h b/packager/media/formats/webm/multi_segment_segmenter.h index 147c408775..7646ff1487 100644 --- a/packager/media/formats/webm/multi_segment_segmenter.h +++ b/packager/media/formats/webm/multi_segment_segmenter.h @@ -13,7 +13,7 @@ #include "packager/media/base/status.h" #include "packager/media/formats/webm/mkv_writer.h" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -53,6 +53,6 @@ class MultiSegmentSegmenter : public Segmenter { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_ diff --git a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc index 39082d601b..492955cacd 100644 --- a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc @@ -9,7 +9,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/webm/segmenter_test_base.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -245,5 +245,5 @@ TEST_F(MultiSegmentSegmenterTest, RespectsFragmentSAPAlign) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/seek_head.cc b/packager/media/formats/webm/seek_head.cc index 5935a2eeb7..15f21ea1b5 100644 --- a/packager/media/formats/webm/seek_head.cc +++ b/packager/media/formats/webm/seek_head.cc @@ -11,7 +11,7 @@ #include "packager/third_party/libwebm/src/mkvmuxerutil.hpp" #include "packager/third_party/libwebm/src/webmids.hpp" -namespace edash_packager { +namespace shaka { namespace media { namespace { const mkvmuxer::uint64 kElementIds[] = { @@ -121,4 +121,4 @@ uint64_t SeekHead::GetPayloadSize(std::vector* data) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/seek_head.h b/packager/media/formats/webm/seek_head.h index 438f4b0aac..ccd5188d85 100644 --- a/packager/media/formats/webm/seek_head.h +++ b/packager/media/formats/webm/seek_head.h @@ -13,7 +13,7 @@ #include "base/macros.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { /// Used to write the SeekHead to the output stream. This supports non-seekable @@ -47,6 +47,6 @@ class SeekHead { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_SEEK_HEAD_H_ diff --git a/packager/media/formats/webm/segmenter.cc b/packager/media/formats/webm/segmenter.cc index f3d2a06988..b6a231239d 100644 --- a/packager/media/formats/webm/segmenter.cc +++ b/packager/media/formats/webm/segmenter.cc @@ -19,7 +19,7 @@ #include "packager/third_party/libwebm/src/mkvmuxerutil.hpp" #include "packager/third_party/libwebm/src/webmids.hpp" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { namespace { @@ -412,4 +412,4 @@ Status Segmenter::WriteFrame(bool write_duration) { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/segmenter.h b/packager/media/formats/webm/segmenter.h index 148a5fc1bc..f1f10911cd 100644 --- a/packager/media/formats/webm/segmenter.h +++ b/packager/media/formats/webm/segmenter.h @@ -15,7 +15,7 @@ #include "packager/media/formats/webm/seek_head.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -163,6 +163,6 @@ class Segmenter { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_SEGMENTER_H_ diff --git a/packager/media/formats/webm/segmenter_test_base.cc b/packager/media/formats/webm/segmenter_test_base.cc index 628fba8062..b79d435c65 100644 --- a/packager/media/formats/webm/segmenter_test_base.cc +++ b/packager/media/formats/webm/segmenter_test_base.cc @@ -10,7 +10,7 @@ #include "packager/media/file/memory_file.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -197,5 +197,5 @@ bool SegmentTestBase::ClusterParser::OnString(int id, const std::string& str) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/segmenter_test_base.h b/packager/media/formats/webm/segmenter_test_base.h index 6c955113ec..45717f5de7 100644 --- a/packager/media/formats/webm/segmenter_test_base.h +++ b/packager/media/formats/webm/segmenter_test_base.h @@ -22,7 +22,7 @@ #include "packager/media/formats/webm/segmenter.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class SegmentTestBase : public ::testing::Test { @@ -111,6 +111,6 @@ class SegmentTestBase : public ::testing::Test { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_ diff --git a/packager/media/formats/webm/single_segment_segmenter.cc b/packager/media/formats/webm/single_segment_segmenter.cc index 65b4b42d04..285b4d9036 100644 --- a/packager/media/formats/webm/single_segment_segmenter.cc +++ b/packager/media/formats/webm/single_segment_segmenter.cc @@ -9,7 +9,7 @@ #include "packager/media/base/muxer_options.h" #include "packager/third_party/libwebm/src/mkvmuxer.hpp" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { @@ -87,4 +87,4 @@ bool SingleSegmentSegmenter::GetIndexRangeStartAndEnd(uint64_t* start, } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/single_segment_segmenter.h b/packager/media/formats/webm/single_segment_segmenter.h index 1b8a9e215d..e363272236 100644 --- a/packager/media/formats/webm/single_segment_segmenter.h +++ b/packager/media/formats/webm/single_segment_segmenter.h @@ -13,7 +13,7 @@ #include "packager/media/base/status.h" #include "packager/media/formats/webm/mkv_writer.h" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -60,6 +60,6 @@ class SingleSegmentSegmenter : public Segmenter { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_ diff --git a/packager/media/formats/webm/single_segment_segmenter_unittest.cc b/packager/media/formats/webm/single_segment_segmenter_unittest.cc index 75e249cafa..098e6717d8 100644 --- a/packager/media/formats/webm/single_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/single_segment_segmenter_unittest.cc @@ -10,7 +10,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/formats/webm/segmenter_test_base.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -263,5 +263,5 @@ INSTANTIATE_TEST_CASE_P(TrueIsTwoPass, ::testing::Bool()); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/tracks_builder.cc b/packager/media/formats/webm/tracks_builder.cc index 8ee2cc14cf..92ed1007e2 100644 --- a/packager/media/formats/webm/tracks_builder.cc +++ b/packager/media/formats/webm/tracks_builder.cc @@ -7,7 +7,7 @@ #include "packager/base/logging.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { // Returns size of an integer, formatted using Matroska serialization. @@ -394,4 +394,4 @@ void TracksBuilder::Track::Write(uint8_t** buf, int* buf_size) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/tracks_builder.h b/packager/media/formats/webm/tracks_builder.h index b21cfae486..9de52f434d 100644 --- a/packager/media/formats/webm/tracks_builder.h +++ b/packager/media/formats/webm/tracks_builder.h @@ -13,7 +13,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { class TracksBuilder { @@ -114,6 +114,6 @@ class TracksBuilder { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_ diff --git a/packager/media/formats/webm/two_pass_single_segment_segmenter.cc b/packager/media/formats/webm/two_pass_single_segment_segmenter.cc index 9f589adf5f..88036b3070 100644 --- a/packager/media/formats/webm/two_pass_single_segment_segmenter.cc +++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.cc @@ -24,7 +24,7 @@ #include "packager/third_party/libwebm/src/mkvmuxerutil.hpp" #include "packager/third_party/libwebm/src/webmids.hpp" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { namespace { @@ -181,4 +181,4 @@ bool TwoPassSingleSegmentSegmenter::CopyFileWithClusterRewrite( } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/two_pass_single_segment_segmenter.h b/packager/media/formats/webm/two_pass_single_segment_segmenter.h index bcfb94ac5b..3806750e3d 100644 --- a/packager/media/formats/webm/two_pass_single_segment_segmenter.h +++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.h @@ -15,7 +15,7 @@ #include "packager/media/base/status.h" #include "packager/media/formats/webm/mkv_writer.h" -namespace edash_packager { +namespace shaka { namespace media { struct MuxerOptions; @@ -50,6 +50,6 @@ class TwoPassSingleSegmentSegmenter : public SingleSegmentSegmenter { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_ diff --git a/packager/media/formats/webm/webm_audio_client.cc b/packager/media/formats/webm/webm_audio_client.cc index 3475c6bad4..ead2c22cf7 100644 --- a/packager/media/formats/webm/webm_audio_client.cc +++ b/packager/media/formats/webm/webm_audio_client.cc @@ -12,7 +12,7 @@ namespace { const uint32_t kWebMTimeScale = 1000000u; } // namespace -namespace edash_packager { +namespace shaka { namespace media { WebMAudioClient::WebMAudioClient() { @@ -117,4 +117,4 @@ bool WebMAudioClient::OnFloat(int id, double val) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_audio_client.h b/packager/media/formats/webm/webm_audio_client.h index 934479d965..69c282751c 100644 --- a/packager/media/formats/webm/webm_audio_client.h +++ b/packager/media/formats/webm/webm_audio_client.h @@ -12,7 +12,7 @@ #include "packager/media/base/audio_stream_info.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class AudioDecoderConfig; @@ -62,6 +62,6 @@ class WebMAudioClient : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_ diff --git a/packager/media/formats/webm/webm_cluster_parser.cc b/packager/media/formats/webm/webm_cluster_parser.cc index 48c7430ea6..61087bc69b 100644 --- a/packager/media/formats/webm/webm_cluster_parser.cc +++ b/packager/media/formats/webm/webm_cluster_parser.cc @@ -17,7 +17,7 @@ #include "packager/media/formats/webm/webm_crypto_helpers.h" #include "packager/media/formats/webm/webm_webvtt_parser.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -631,4 +631,4 @@ WebMClusterParser::FindTextTrack(int track_num) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_cluster_parser.h b/packager/media/formats/webm/webm_cluster_parser.h index 256825a4a8..78ad269690 100644 --- a/packager/media/formats/webm/webm_cluster_parser.h +++ b/packager/media/formats/webm/webm_cluster_parser.h @@ -18,7 +18,7 @@ #include "packager/media/formats/webm/webm_parser.h" #include "packager/media/formats/webm/webm_tracks_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class WebMClusterParser : public WebMParserClient { @@ -227,6 +227,6 @@ class WebMClusterParser : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ diff --git a/packager/media/formats/webm/webm_cluster_parser_unittest.cc b/packager/media/formats/webm/webm_cluster_parser_unittest.cc index 70a52bf2b2..e0b674e4ec 100644 --- a/packager/media/formats/webm/webm_cluster_parser_unittest.cc +++ b/packager/media/formats/webm/webm_cluster_parser_unittest.cc @@ -29,7 +29,7 @@ using ::testing::StrictMock; using ::testing::Mock; using ::testing::_; -namespace edash_packager { +namespace shaka { namespace media { typedef WebMTracksParser::TextTracks TextTracks; @@ -1120,4 +1120,4 @@ TEST_F(WebMClusterParserTest, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_constants.cc b/packager/media/formats/webm/webm_constants.cc index 82f77e9797..13b4f22b87 100644 --- a/packager/media/formats/webm/webm_constants.cc +++ b/packager/media/formats/webm/webm_constants.cc @@ -4,7 +4,7 @@ #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { const char kWebMCodecSubtitles[] = "D_WEBVTT/SUBTITLES"; @@ -13,4 +13,4 @@ const char kWebMCodecDescriptions[] = "D_WEBVTT/DESCRIPTIONS"; const char kWebMCodecMetadata[] = "D_WEBVTT/METADATA"; } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_constants.h b/packager/media/formats/webm/webm_constants.h index 18620794cf..86a3af1cbd 100644 --- a/packager/media/formats/webm/webm_constants.h +++ b/packager/media/formats/webm/webm_constants.h @@ -7,7 +7,7 @@ #include -namespace edash_packager { +namespace shaka { namespace media { /// WebM element IDs. @@ -225,6 +225,6 @@ extern const char kWebMCodecDescriptions[]; extern const char kWebMCodecMetadata[]; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_ diff --git a/packager/media/formats/webm/webm_content_encodings.cc b/packager/media/formats/webm/webm_content_encodings.cc index 217b419cfd..e66912a0df 100644 --- a/packager/media/formats/webm/webm_content_encodings.cc +++ b/packager/media/formats/webm/webm_content_encodings.cc @@ -5,7 +5,7 @@ #include "packager/base/logging.h" #include "packager/media/formats/webm/webm_content_encodings.h" -namespace edash_packager { +namespace shaka { namespace media { ContentEncoding::ContentEncoding() @@ -27,4 +27,4 @@ void ContentEncoding::SetEncryptionKeyId(const uint8_t* encryption_key_id, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_content_encodings.h b/packager/media/formats/webm/webm_content_encodings.h index 690c3dc90e..95b7a6135a 100644 --- a/packager/media/formats/webm/webm_content_encodings.h +++ b/packager/media/formats/webm/webm_content_encodings.h @@ -10,7 +10,7 @@ #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace media { class ContentEncoding { @@ -84,6 +84,6 @@ class ContentEncoding { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ diff --git a/packager/media/formats/webm/webm_content_encodings_client.cc b/packager/media/formats/webm/webm_content_encodings_client.cc index 27f8c730fc..3c3100c2f3 100644 --- a/packager/media/formats/webm/webm_content_encodings_client.cc +++ b/packager/media/formats/webm/webm_content_encodings_client.cc @@ -8,7 +8,7 @@ #include "packager/base/stl_util.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { WebMContentEncodingsClient::WebMContentEncodingsClient() @@ -264,4 +264,4 @@ bool WebMContentEncodingsClient::OnBinary(int id, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_content_encodings_client.h b/packager/media/formats/webm/webm_content_encodings_client.h index 61396744ef..8cc2eca7be 100644 --- a/packager/media/formats/webm/webm_content_encodings_client.h +++ b/packager/media/formats/webm/webm_content_encodings_client.h @@ -13,7 +13,7 @@ #include "packager/media/formats/webm/webm_content_encodings.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { typedef std::vector ContentEncodings; @@ -44,6 +44,6 @@ class WebMContentEncodingsClient : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_ diff --git a/packager/media/formats/webm/webm_content_encodings_client_unittest.cc b/packager/media/formats/webm/webm_content_encodings_client_unittest.cc index 7f7d25b63d..cd34ddd1b1 100644 --- a/packager/media/formats/webm/webm_content_encodings_client_unittest.cc +++ b/packager/media/formats/webm/webm_content_encodings_client_unittest.cc @@ -12,7 +12,7 @@ #include "packager/media/formats/webm/webm_constants.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class WebMContentEncodingsClientTest : public testing::Test { @@ -240,4 +240,4 @@ TEST_F(WebMContentEncodingsClientTest, InvalidContentEncAlgo) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_crypto_helpers.cc b/packager/media/formats/webm/webm_crypto_helpers.cc index 338d13c087..6c977baaa6 100644 --- a/packager/media/formats/webm/webm_crypto_helpers.cc +++ b/packager/media/formats/webm/webm_crypto_helpers.cc @@ -8,7 +8,7 @@ #include "packager/base/sys_byteorder.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -62,4 +62,4 @@ bool WebMCreateDecryptConfig(const uint8_t* data, } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_crypto_helpers.h b/packager/media/formats/webm/webm_crypto_helpers.h index 62afb32663..839a948732 100644 --- a/packager/media/formats/webm/webm_crypto_helpers.h +++ b/packager/media/formats/webm/webm_crypto_helpers.h @@ -10,7 +10,7 @@ #include "packager/base/memory/scoped_ptr.h" #include "packager/media/base/decrypt_config.h" -namespace edash_packager { +namespace shaka { namespace media { /// Fills an initialized DecryptConfig, which can be sent to the Decryptor if @@ -29,6 +29,6 @@ bool WebMCreateDecryptConfig(const uint8_t* data, int* data_offset); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_ diff --git a/packager/media/formats/webm/webm_info_parser.cc b/packager/media/formats/webm/webm_info_parser.cc index a241a60c02..a55d0f453e 100644 --- a/packager/media/formats/webm/webm_info_parser.cc +++ b/packager/media/formats/webm/webm_info_parser.cc @@ -7,7 +7,7 @@ #include "packager/base/logging.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { // Default timecode scale if the TimecodeScale element is @@ -102,4 +102,4 @@ bool WebMInfoParser::OnString(int id, const std::string& str) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_info_parser.h b/packager/media/formats/webm/webm_info_parser.h index 553c02add0..4a963978e2 100644 --- a/packager/media/formats/webm/webm_info_parser.h +++ b/packager/media/formats/webm/webm_info_parser.h @@ -9,7 +9,7 @@ #include "packager/base/time/time.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { /// Parser for WebM Info element. @@ -45,6 +45,6 @@ class WebMInfoParser : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_ diff --git a/packager/media/formats/webm/webm_media_parser.cc b/packager/media/formats/webm/webm_media_parser.cc index 8288240755..967cd74f89 100644 --- a/packager/media/formats/webm/webm_media_parser.cc +++ b/packager/media/formats/webm/webm_media_parser.cc @@ -17,7 +17,7 @@ #include "packager/media/formats/webm/webm_info_parser.h" #include "packager/media/formats/webm/webm_tracks_parser.h" -namespace edash_packager { +namespace shaka { namespace media { WebMMediaParser::WebMMediaParser() @@ -261,4 +261,4 @@ bool WebMMediaParser::FetchKeysIfNecessary( } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_media_parser.h b/packager/media/formats/webm/webm_media_parser.h index 5278bd6bea..47a20d44ba 100644 --- a/packager/media/formats/webm/webm_media_parser.h +++ b/packager/media/formats/webm/webm_media_parser.h @@ -11,7 +11,7 @@ #include "packager/media/base/byte_queue.h" #include "packager/media/base/media_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class WebMClusterParser; @@ -78,6 +78,6 @@ class WebMMediaParser : public MediaParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_ diff --git a/packager/media/formats/webm/webm_muxer.cc b/packager/media/formats/webm/webm_muxer.cc index b67752d086..ff9f7cb85d 100644 --- a/packager/media/formats/webm/webm_muxer.cc +++ b/packager/media/formats/webm/webm_muxer.cc @@ -15,7 +15,7 @@ #include "packager/media/formats/webm/single_segment_segmenter.h" #include "packager/media/formats/webm/two_pass_single_segment_segmenter.h" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { @@ -123,4 +123,4 @@ void WebMMuxer::FireOnMediaEndEvent() { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_muxer.h b/packager/media/formats/webm/webm_muxer.h index 74198d5921..d60a42dba8 100644 --- a/packager/media/formats/webm/webm_muxer.h +++ b/packager/media/formats/webm/webm_muxer.h @@ -9,7 +9,7 @@ #include "packager/media/base/muxer.h" -namespace edash_packager { +namespace shaka { namespace media { namespace webm { @@ -39,6 +39,6 @@ class WebMMuxer : public Muxer { } // namespace webm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_MUXER_H_ diff --git a/packager/media/formats/webm/webm_parser.cc b/packager/media/formats/webm/webm_parser.cc index fce7f7f4c1..a2358ea180 100644 --- a/packager/media/formats/webm/webm_parser.cc +++ b/packager/media/formats/webm/webm_parser.cc @@ -17,7 +17,7 @@ #include "packager/base/numerics/safe_conversions.h" #include "packager/media/formats/webm/webm_constants.h" -namespace edash_packager { +namespace shaka { namespace media { enum ElementType { @@ -970,4 +970,4 @@ bool WebMListParser::IsSiblingOrAncestor(int id_a, int id_b) const { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_parser.h b/packager/media/formats/webm/webm_parser.h index 7d509735eb..81dd6da4fb 100644 --- a/packager/media/formats/webm/webm_parser.h +++ b/packager/media/formats/webm/webm_parser.h @@ -12,7 +12,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { /// Interface for receiving WebM parser events. @@ -158,6 +158,6 @@ int WebMParseElementHeader(const uint8_t* buf, int64_t* element_size); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_PARSER_H_ diff --git a/packager/media/formats/webm/webm_parser_unittest.cc b/packager/media/formats/webm/webm_parser_unittest.cc index 434ebf9e7f..b20c9acbb2 100644 --- a/packager/media/formats/webm/webm_parser_unittest.cc +++ b/packager/media/formats/webm/webm_parser_unittest.cc @@ -17,7 +17,7 @@ using ::testing::StrEq; using ::testing::StrictMock; using ::testing::_; -namespace edash_packager { +namespace shaka { namespace media { enum { kBlockCount = 5 }; @@ -410,4 +410,4 @@ TEST_F(WebMParserTest, ZeroPaddedStrings) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_tracks_parser.cc b/packager/media/formats/webm/webm_tracks_parser.cc index 56966634d8..f496f0b6e2 100644 --- a/packager/media/formats/webm/webm_tracks_parser.cc +++ b/packager/media/formats/webm/webm_tracks_parser.cc @@ -11,7 +11,7 @@ #include "packager/media/formats/webm/webm_constants.h" #include "packager/media/formats/webm/webm_content_encodings.h" -namespace edash_packager { +namespace shaka { namespace media { static TextKind CodecIdToTextKind(const std::string& codec_id) { @@ -338,4 +338,4 @@ bool WebMTracksParser::OnString(int id, const std::string& str) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_tracks_parser.h b/packager/media/formats/webm/webm_tracks_parser.h index b05084c340..dfce0d3466 100644 --- a/packager/media/formats/webm/webm_tracks_parser.h +++ b/packager/media/formats/webm/webm_tracks_parser.h @@ -21,7 +21,7 @@ #include "packager/media/formats/webm/webm_parser.h" #include "packager/media/formats/webm/webm_video_client.h" -namespace edash_packager { +namespace shaka { namespace media { /// Parser for WebM Tracks element. @@ -110,6 +110,6 @@ class WebMTracksParser : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ diff --git a/packager/media/formats/webm/webm_tracks_parser_unittest.cc b/packager/media/formats/webm/webm_tracks_parser_unittest.cc index 63171ec43c..825e8f5810 100644 --- a/packager/media/formats/webm/webm_tracks_parser_unittest.cc +++ b/packager/media/formats/webm/webm_tracks_parser_unittest.cc @@ -18,7 +18,7 @@ using ::testing::Return; using ::testing::StrictMock; using ::testing::_; -namespace edash_packager { +namespace shaka { namespace media { static const double kDefaultTimecodeScaleInUs = 1000.0; // 1 ms resolution @@ -202,4 +202,4 @@ TEST_F(WebMTracksParserTest, HighTrackUID) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_video_client.cc b/packager/media/formats/webm/webm_video_client.cc index b99888cd6f..dc832e23c1 100644 --- a/packager/media/formats/webm/webm_video_client.cc +++ b/packager/media/formats/webm/webm_video_client.cc @@ -24,7 +24,7 @@ int64_t GetGreatestCommonDivisor(int64_t a, int64_t b) { } // namespace -namespace edash_packager { +namespace shaka { namespace media { WebMVideoClient::WebMVideoClient() { @@ -170,4 +170,4 @@ bool WebMVideoClient::OnFloat(int id, double val) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_video_client.h b/packager/media/formats/webm/webm_video_client.h index ccccfe33fc..1a1ecdebbb 100644 --- a/packager/media/formats/webm/webm_video_client.h +++ b/packager/media/formats/webm/webm_video_client.h @@ -12,7 +12,7 @@ #include "packager/media/base/video_stream_info.h" #include "packager/media/formats/webm/webm_parser.h" -namespace edash_packager { +namespace shaka { namespace media { class VideoDecoderConfig; @@ -58,6 +58,6 @@ class WebMVideoClient : public WebMParserClient { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ diff --git a/packager/media/formats/webm/webm_webvtt_parser.cc b/packager/media/formats/webm/webm_webvtt_parser.cc index 356c09d016..3303a37a06 100644 --- a/packager/media/formats/webm/webm_webvtt_parser.cc +++ b/packager/media/formats/webm/webm_webvtt_parser.cc @@ -4,7 +4,7 @@ #include "packager/media/formats/webm/webm_webvtt_parser.h" -namespace edash_packager { +namespace shaka { namespace media { void WebMWebVTTParser::Parse(const uint8_t* payload, @@ -76,4 +76,4 @@ void WebMWebVTTParser::ParseLine(std::string* line) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webm/webm_webvtt_parser.h b/packager/media/formats/webm/webm_webvtt_parser.h index 3013d83df0..95dd1e09df 100644 --- a/packager/media/formats/webm/webm_webvtt_parser.h +++ b/packager/media/formats/webm/webm_webvtt_parser.h @@ -11,7 +11,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { namespace media { class WebMWebVTTParser { @@ -48,6 +48,6 @@ class WebMWebVTTParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_ diff --git a/packager/media/formats/webm/webm_webvtt_parser_unittest.cc b/packager/media/formats/webm/webm_webvtt_parser_unittest.cc index aec5128ce4..1d4b6b5c93 100644 --- a/packager/media/formats/webm/webm_webvtt_parser_unittest.cc +++ b/packager/media/formats/webm/webm_webvtt_parser_unittest.cc @@ -9,7 +9,7 @@ using ::testing::InSequence; -namespace edash_packager { +namespace shaka { namespace media { typedef std::vector Cue; @@ -105,4 +105,4 @@ TEST_F(WebMWebVTTParserTest, Content) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webvtt/webvtt_media_parser.cc b/packager/media/formats/webvtt/webvtt_media_parser.cc index 9e24f6effd..e7bb364933 100644 --- a/packager/media/formats/webvtt/webvtt_media_parser.cc +++ b/packager/media/formats/webvtt/webvtt_media_parser.cc @@ -17,7 +17,7 @@ #include "packager/media/base/media_sample.h" #include "packager/media/base/text_stream_info.h" -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -389,4 +389,4 @@ bool WebVttMediaParser::Parse(const uint8_t* buf, int size) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/webvtt/webvtt_media_parser.h b/packager/media/formats/webvtt/webvtt_media_parser.h index 930bdf4b49..b55aadd7fc 100644 --- a/packager/media/formats/webvtt/webvtt_media_parser.h +++ b/packager/media/formats/webvtt/webvtt_media_parser.h @@ -14,7 +14,7 @@ #include "packager/base/compiler_specific.h" #include "packager/media/base/media_parser.h" -namespace edash_packager { +namespace shaka { namespace media { // If comment is not empty, then this is metadata and other fields must @@ -80,6 +80,6 @@ class WebVttMediaParser : public MediaParser { }; } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_ diff --git a/packager/media/formats/webvtt/webvtt_media_parser_unittest.cc b/packager/media/formats/webvtt/webvtt_media_parser_unittest.cc index 9e9b0fda41..eefc1591db 100644 --- a/packager/media/formats/webvtt/webvtt_media_parser_unittest.cc +++ b/packager/media/formats/webvtt/webvtt_media_parser_unittest.cc @@ -12,7 +12,7 @@ #include "packager/media/base/stream_info.h" #include "packager/media/formats/webvtt/webvtt_media_parser.h" -namespace edash_packager { +namespace shaka { namespace media { typedef testing::MockFunction>& @@ -315,4 +315,4 @@ TEST_F(WebVttMediaParserTest, NoTimingAfterIdentifier) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/wvm/wvm_media_parser.cc b/packager/media/formats/wvm/wvm_media_parser.cc index a2761dd71c..1c88204402 100644 --- a/packager/media/formats/wvm/wvm_media_parser.cc +++ b/packager/media/formats/wvm/wvm_media_parser.cc @@ -84,7 +84,7 @@ enum Type { }; } // namespace -namespace edash_packager { +namespace shaka { namespace media { namespace wvm { @@ -1167,4 +1167,4 @@ void PrevSampleData::Reset() { } // namespace wvm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h index a71d4055a9..064272f8aa 100644 --- a/packager/media/formats/wvm/wvm_media_parser.h +++ b/packager/media/formats/wvm/wvm_media_parser.h @@ -17,7 +17,7 @@ #include "packager/media/base/network_util.h" #include "packager/media/filters/h264_byte_to_unit_stream_converter.h" -namespace edash_packager { +namespace shaka { namespace media { class AesCbcDecryptor; @@ -259,6 +259,6 @@ class WvmMediaParser : public MediaParser { } // namespace wvm } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_ diff --git a/packager/media/formats/wvm/wvm_media_parser_unittest.cc b/packager/media/formats/wvm/wvm_media_parser_unittest.cc index 4286e49f69..81ffcf318f 100644 --- a/packager/media/formats/wvm/wvm_media_parser_unittest.cc +++ b/packager/media/formats/wvm/wvm_media_parser_unittest.cc @@ -46,7 +46,7 @@ using ::testing::DoAll; using ::testing::Return; using ::testing::SetArgPointee; -namespace edash_packager { +namespace shaka { namespace media { class MockKeySource : public FixedKeySource { @@ -259,4 +259,4 @@ TEST_F(WvmMediaParserTest, ParseMultiConfigWvm) { } // namespace wvm } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/test/packager_test.cc b/packager/media/test/packager_test.cc index d23f50975c..1f0c840cb3 100644 --- a/packager/media/test/packager_test.cc +++ b/packager/media/test/packager_test.cc @@ -22,7 +22,7 @@ using ::testing::ValuesIn; -namespace edash_packager { +namespace shaka { namespace media { namespace { @@ -419,4 +419,4 @@ INSTANTIATE_TEST_CASE_P(PackagerEndToEnd, INSTANTIATE_TEST_CASE_P(PackagerEndToEnd, PackagerTest, ValuesIn(kMediaFiles)); } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/test/test_data_util.cc b/packager/media/test/test_data_util.cc index a47a1cdc40..863f2cc608 100644 --- a/packager/media/test/test_data_util.cc +++ b/packager/media/test/test_data_util.cc @@ -8,7 +8,7 @@ #include "packager/base/logging.h" #include "packager/base/path_service.h" -namespace edash_packager { +namespace shaka { namespace media { base::FilePath GetTestDataFilePath(const std::string& name) { @@ -30,4 +30,4 @@ std::vector ReadTestDataFile(const std::string& name) { } } // namespace media -} // namespace edash_packager +} // namespace shaka diff --git a/packager/media/test/test_data_util.h b/packager/media/test/test_data_util.h index cce28d1cce..4f62f20cec 100644 --- a/packager/media/test/test_data_util.h +++ b/packager/media/test/test_data_util.h @@ -11,7 +11,7 @@ #include "packager/base/files/file_path.h" -namespace edash_packager { +namespace shaka { namespace media { // Returns a file path for a file in the media/test/data directory. @@ -21,6 +21,6 @@ base::FilePath GetTestDataFilePath(const std::string& name); std::vector ReadTestDataFile(const std::string& name); } // namespace media -} // namespace edash_packager +} // namespace shaka #endif // MEDIA_TEST_TEST_DATA_UTIL_H_ diff --git a/packager/mpd/base/bandwidth_estimator_unittest.cc b/packager/mpd/base/bandwidth_estimator_unittest.cc index a38016c6c8..684e398acc 100644 --- a/packager/mpd/base/bandwidth_estimator_unittest.cc +++ b/packager/mpd/base/bandwidth_estimator_unittest.cc @@ -11,7 +11,7 @@ #include "packager/base/macros.h" #include "packager/mpd/base/bandwidth_estimator.h" -namespace edash_packager { +namespace shaka { namespace { const int kNumBlocksForEstimate = 5; @@ -93,4 +93,4 @@ TEST(BandwidthEstimatorTest, FirstOneBlock) { EXPECT_EQ(kExptectedEstimate, be.Estimate()); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/content_protection_element.cc b/packager/mpd/base/content_protection_element.cc index 908e491f0e..11ff2cce7f 100644 --- a/packager/mpd/base/content_protection_element.cc +++ b/packager/mpd/base/content_protection_element.cc @@ -6,9 +6,9 @@ #include "packager/mpd/base/content_protection_element.h" -namespace edash_packager { +namespace shaka { Element::Element() {} Element::~Element() {} ContentProtectionElement::ContentProtectionElement() {} ContentProtectionElement::~ContentProtectionElement() {} -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/content_protection_element.h b/packager/mpd/base/content_protection_element.h index 8792249e72..368b3d96d6 100644 --- a/packager/mpd/base/content_protection_element.h +++ b/packager/mpd/base/content_protection_element.h @@ -16,7 +16,7 @@ #include #include -namespace edash_packager { +namespace shaka { // This is any (XML) element. struct Element { @@ -47,6 +47,6 @@ struct ContentProtectionElement { std::vector subelements; }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_CONTENT_PROTECTION_ELEMENT_H_ diff --git a/packager/mpd/base/dash_iop_mpd_notifier.cc b/packager/mpd/base/dash_iop_mpd_notifier.cc index 7ed8f41d60..62cba711a9 100644 --- a/packager/mpd/base/dash_iop_mpd_notifier.cc +++ b/packager/mpd/base/dash_iop_mpd_notifier.cc @@ -10,7 +10,7 @@ #include "packager/mpd/base/mpd_notifier_util.h" #include "packager/mpd/base/mpd_utils.h" -namespace edash_packager { +namespace shaka { namespace { @@ -282,4 +282,4 @@ AdaptationSet* DashIopMpdNotifier::NewAdaptationSet( return new_adaptation_set; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/dash_iop_mpd_notifier.h b/packager/mpd/base/dash_iop_mpd_notifier.h index 4c534ae572..3a597fc4b3 100644 --- a/packager/mpd/base/dash_iop_mpd_notifier.h +++ b/packager/mpd/base/dash_iop_mpd_notifier.h @@ -19,7 +19,7 @@ #include "packager/mpd/base/mpd_notifier_util.h" #include "packager/mpd/base/mpd_options.h" -namespace edash_packager { +namespace shaka { /// This class is an MpdNotifier which will try its best to generate a /// DASH IF IOPv3 compliant MPD. @@ -111,6 +111,6 @@ class DashIopMpdNotifier : public MpdNotifier { std::map representation_id_to_adaptation_set_; }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_DASH_IOP_MPD_NOTIFIER_H_ diff --git a/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc b/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc index efedead277..54bae084b4 100644 --- a/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc +++ b/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc @@ -14,7 +14,7 @@ #include "packager/mpd/base/mpd_builder.h" #include "packager/mpd/test/mpd_builder_test_helper.h" -namespace edash_packager { +namespace shaka { using ::testing::_; using ::testing::Eq; @@ -875,4 +875,4 @@ INSTANTIATE_TEST_CASE_P(StaticAndDynamic, ::testing::Values(MpdBuilder::kStatic, MpdBuilder::kDynamic)); -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/language_utils.cc b/packager/mpd/base/language_utils.cc index eaeef91804..cc2d938d66 100644 --- a/packager/mpd/base/language_utils.cc +++ b/packager/mpd/base/language_utils.cc @@ -84,7 +84,7 @@ void SplitLanguageTag(const std::string& tag, } // namespace -namespace edash_packager { +namespace shaka { std::string LanguageToShortestForm(const std::string& language) { std::string main_language; @@ -131,4 +131,4 @@ std::string LanguageToISO_639_2(const std::string& language) { return "und"; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/language_utils.h b/packager/mpd/base/language_utils.h index 650256a2ca..0a1a5e4054 100644 --- a/packager/mpd/base/language_utils.h +++ b/packager/mpd/base/language_utils.h @@ -11,7 +11,7 @@ #include -namespace edash_packager { +namespace shaka { /// Convert a language tag to its shortest form, as required by RFC 5646 /// indicated in the MPD spec. Assumes the input is a valid ISO-639-2 or @@ -23,6 +23,6 @@ std::string LanguageToShortestForm(const std::string& language); /// language code. Regions and variants are not supported. std::string LanguageToISO_639_2(const std::string& language); -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_LANGUAGE_UTILS_H_ diff --git a/packager/mpd/base/media_info.proto b/packager/mpd/base/media_info.proto index 94facab15f..7186c900a4 100644 --- a/packager/mpd/base/media_info.proto +++ b/packager/mpd/base/media_info.proto @@ -3,7 +3,7 @@ syntax = "proto2"; -package edash_packager; +package shaka; message Range { optional uint64 begin = 1; diff --git a/packager/mpd/base/mock_mpd_builder.cc b/packager/mpd/base/mock_mpd_builder.cc index b9bbf747ce..c53004f6bf 100644 --- a/packager/mpd/base/mock_mpd_builder.cc +++ b/packager/mpd/base/mock_mpd_builder.cc @@ -2,7 +2,7 @@ #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { namespace { const char kEmptyLang[] = ""; const MpdOptions kDefaultMpdOptions; @@ -30,4 +30,4 @@ MockRepresentation::MockRepresentation(uint32_t representation_id) scoped_ptr()) {} MockRepresentation::~MockRepresentation() {} -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mock_mpd_builder.h b/packager/mpd/base/mock_mpd_builder.h index 8753983d5a..45c40c1176 100644 --- a/packager/mpd/base/mock_mpd_builder.h +++ b/packager/mpd/base/mock_mpd_builder.h @@ -14,7 +14,7 @@ #include "packager/mpd/base/content_protection_element.h" #include "packager/mpd/base/mpd_builder.h" -namespace edash_packager { +namespace shaka { class MockMpdBuilder : public MpdBuilder { public: @@ -64,6 +64,6 @@ class MockRepresentation : public Representation { MOCK_METHOD1(SetSampleDuration, void(uint32_t sample_duration)); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MOCK_MPD_BUILDER_H_ diff --git a/packager/mpd/base/mock_mpd_notifier.cc b/packager/mpd/base/mock_mpd_notifier.cc index 22c35daaa3..6e87d9da0b 100644 --- a/packager/mpd/base/mock_mpd_notifier.cc +++ b/packager/mpd/base/mock_mpd_notifier.cc @@ -1,8 +1,8 @@ #include "packager/mpd/base/mock_mpd_notifier.h" -namespace edash_packager { +namespace shaka { MockMpdNotifier::MockMpdNotifier(DashProfile profile) : MpdNotifier(profile) {} MockMpdNotifier::~MockMpdNotifier() {} -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mock_mpd_notifier.h b/packager/mpd/base/mock_mpd_notifier.h index 262c3519d3..45897c5bb0 100644 --- a/packager/mpd/base/mock_mpd_notifier.h +++ b/packager/mpd/base/mock_mpd_notifier.h @@ -14,7 +14,7 @@ #include "packager/mpd/base/content_protection_element.h" #include "packager/mpd/base/media_info.pb.h" -namespace edash_packager { +namespace shaka { class MockMpdNotifier : public MpdNotifier { public: @@ -43,6 +43,6 @@ class MockMpdNotifier : public MpdNotifier { MOCK_METHOD0(Flush, bool()); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MOCK_MPD_NOTIFIER_H_ diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc index a41fe06358..e333ef00f1 100644 --- a/packager/mpd/base/mpd_builder.cc +++ b/packager/mpd/base/mpd_builder.cc @@ -30,7 +30,7 @@ #include "packager/mpd/base/mpd_utils.h" #include "packager/mpd/base/xml/xml_node.h" -namespace edash_packager { +namespace shaka { using base::FilePath; using xml::XmlNode; @@ -1377,4 +1377,4 @@ bool Representation::GetEarliestTimestamp(double* timestamp_seconds) { return true; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mpd_builder.h b/packager/mpd/base/mpd_builder.h index b8a7937b87..c630ccdfc3 100644 --- a/packager/mpd/base/mpd_builder.h +++ b/packager/mpd/base/mpd_builder.h @@ -38,7 +38,7 @@ // TODO(rkuroiwa): For classes with |id_|, consider removing the field and let // the MPD (XML) generation functions take care of assigning an ID to each // element. -namespace edash_packager { +namespace shaka { namespace media { class File; @@ -575,6 +575,6 @@ class Representation { DISALLOW_COPY_AND_ASSIGN(Representation); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MPD_BUILDER_H_ diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc index 04c0d6e0a3..0dea219809 100644 --- a/packager/mpd/base/mpd_builder_unittest.cc +++ b/packager/mpd/base/mpd_builder_unittest.cc @@ -21,7 +21,7 @@ #include "packager/mpd/test/mpd_builder_test_helper.h" #include "packager/mpd/test/xml_compare.h" -namespace edash_packager { +namespace shaka { using base::FilePath; @@ -2518,4 +2518,4 @@ TEST(RelativePaths, PathsNotModified) { EXPECT_EQ(kSegmentTemplate, media_info.segment_template()); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mpd_notifier.h b/packager/mpd/base/mpd_notifier.h index 56d966321e..46c27a113f 100644 --- a/packager/mpd/base/mpd_notifier.h +++ b/packager/mpd/base/mpd_notifier.h @@ -16,7 +16,7 @@ #include "packager/base/macros.h" -namespace edash_packager { +namespace shaka { class MediaInfo; struct ContentProtectionElement; @@ -113,6 +113,6 @@ class MpdNotifier { DISALLOW_COPY_AND_ASSIGN(MpdNotifier); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MPD_NOTIFIER_H_ diff --git a/packager/mpd/base/mpd_notifier_util.cc b/packager/mpd/base/mpd_notifier_util.cc index af51ee9a08..eb898cc166 100644 --- a/packager/mpd/base/mpd_notifier_util.cc +++ b/packager/mpd/base/mpd_notifier_util.cc @@ -12,7 +12,7 @@ #include "packager/media/file/file.h" #include "packager/mpd/base/mpd_utils.h" -namespace edash_packager { +namespace shaka { using media::File; using media::FileCloser; @@ -72,4 +72,4 @@ std::string Uint8VectorToBase64(const std::vector& input) { return output; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mpd_notifier_util.h b/packager/mpd/base/mpd_notifier_util.h index a26d4f671f..76c7424122 100644 --- a/packager/mpd/base/mpd_notifier_util.h +++ b/packager/mpd/base/mpd_notifier_util.h @@ -17,7 +17,7 @@ #include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/mpd_builder.h" -namespace edash_packager{ +namespace shaka{ enum ContentType { kContentTypeUnknown, @@ -39,6 +39,6 @@ ContentType GetContentType(const MediaInfo& media_info); /// Converts uint8 vector into base64 encoded string. std::string Uint8VectorToBase64(const std::vector& input); -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MPD_NOTIFIER_UTIL_H_ diff --git a/packager/mpd/base/mpd_options.h b/packager/mpd/base/mpd_options.h index 3fe858ec48..0b5e1fa03e 100644 --- a/packager/mpd/base/mpd_options.h +++ b/packager/mpd/base/mpd_options.h @@ -11,7 +11,7 @@ #include "packager/version/version.h" -namespace edash_packager { +namespace shaka { /// Defines Mpd Options. struct MpdOptions { @@ -34,7 +34,7 @@ struct MpdOptions { std::string packager_version_string; }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MPD_OPTIONS_H_ diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc index 5ec87c1fb0..c43e20d4d2 100644 --- a/packager/mpd/base/mpd_utils.cc +++ b/packager/mpd/base/mpd_utils.cc @@ -12,7 +12,7 @@ #include "packager/base/strings/string_number_conversions.h" #include "packager/mpd/base/xml/scoped_xml_ptr.h" -namespace edash_packager { +namespace shaka { namespace { std::string TextCodecString(const MediaInfo& media_info) { @@ -347,4 +347,4 @@ void AddContentProtectionElements(const MediaInfo& media_info, } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/mpd_utils.h b/packager/mpd/base/mpd_utils.h index 7ef21b1107..b43fe1406a 100644 --- a/packager/mpd/base/mpd_utils.h +++ b/packager/mpd/base/mpd_utils.h @@ -20,7 +20,7 @@ #include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/mpd_builder.h" -namespace edash_packager { +namespace shaka { class MediaInfo; struct ContentProtectionElement; @@ -91,6 +91,6 @@ void AddContentProtectionElements(const MediaInfo& media_info, void AddContentProtectionElements(const MediaInfo& media_info, AdaptationSet* parent); -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_MPD_UTILS_H_ diff --git a/packager/mpd/base/segment_info.h b/packager/mpd/base/segment_info.h index 60d73d2f0a..cf7a38f1a9 100644 --- a/packager/mpd/base/segment_info.h +++ b/packager/mpd/base/segment_info.h @@ -7,7 +7,7 @@ #ifndef MPD_BASE_SEGMENT_INFO_H_ #define MPD_BASE_SEGMENT_INFO_H_ -namespace edash_packager { +namespace shaka { /// Container for keeping track of information about a segment. /// Used for keeping track of all the segments used for generating MPD with /// dynamic profile. @@ -21,6 +21,6 @@ struct SegmentInfo { // in the DASH MPD spec. uint64_t repeat; }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_SEGMENT_INFO_H_ diff --git a/packager/mpd/base/simple_mpd_notifier.cc b/packager/mpd/base/simple_mpd_notifier.cc index a54e35f352..819a01fe1a 100644 --- a/packager/mpd/base/simple_mpd_notifier.cc +++ b/packager/mpd/base/simple_mpd_notifier.cc @@ -11,7 +11,7 @@ #include "packager/mpd/base/mpd_notifier_util.h" #include "packager/mpd/base/mpd_utils.h" -namespace edash_packager { +namespace shaka { SimpleMpdNotifier::SimpleMpdNotifier(DashProfile dash_profile, const MpdOptions& mpd_options, @@ -130,4 +130,4 @@ bool SimpleMpdNotifier::Flush() { return WriteMpdToFile(output_path_, mpd_builder_.get()); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/simple_mpd_notifier.h b/packager/mpd/base/simple_mpd_notifier.h index d8cf2c6ce9..3e8fa201b2 100644 --- a/packager/mpd/base/simple_mpd_notifier.h +++ b/packager/mpd/base/simple_mpd_notifier.h @@ -17,7 +17,7 @@ #include "packager/mpd/base/mpd_notifier.h" #include "packager/mpd/base/mpd_notifier_util.h" -namespace edash_packager { +namespace shaka { class AdaptationSet; class MpdBuilder; @@ -83,6 +83,6 @@ class SimpleMpdNotifier : public MpdNotifier { DISALLOW_COPY_AND_ASSIGN(SimpleMpdNotifier); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_SIMPLE_MPD_NOTIFIER_H_ diff --git a/packager/mpd/base/simple_mpd_notifier_unittest.cc b/packager/mpd/base/simple_mpd_notifier_unittest.cc index cf39747044..646fa445b3 100644 --- a/packager/mpd/base/simple_mpd_notifier_unittest.cc +++ b/packager/mpd/base/simple_mpd_notifier_unittest.cc @@ -14,7 +14,7 @@ #include "packager/mpd/base/simple_mpd_notifier.h" #include "packager/mpd/test/mpd_builder_test_helper.h" -namespace edash_packager { +namespace shaka { using ::testing::_; using ::testing::Return; @@ -408,4 +408,4 @@ INSTANTIATE_TEST_CASE_P(StaticAndDynamic, ::testing::Values(MpdBuilder::kStatic, MpdBuilder::kDynamic)); -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/xml/scoped_xml_ptr.h b/packager/mpd/base/xml/scoped_xml_ptr.h index e8989c8c92..6d20d7d7e3 100644 --- a/packager/mpd/base/xml/scoped_xml_ptr.h +++ b/packager/mpd/base/xml/scoped_xml_ptr.h @@ -15,7 +15,7 @@ #include "packager/base/memory/scoped_ptr.h" -namespace edash_packager { +namespace shaka { namespace xml { /// Deleter functor for deleting libxml2 pointers. This is used with @@ -38,5 +38,5 @@ template using scoped_xml_ptr = scoped_ptr; } // namespace xml -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_XML_SCOPED_XML_PTR_H_ diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc index d07dc96e30..6d7461338c 100644 --- a/packager/mpd/base/xml/xml_node.cc +++ b/packager/mpd/base/xml/xml_node.cc @@ -17,7 +17,7 @@ #include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/segment_info.h" -namespace edash_packager { +namespace shaka { using xml::XmlNode; typedef MediaInfo::AudioInfo AudioInfo; @@ -376,4 +376,4 @@ void RepresentationXmlNode::AddAudioSamplingRateInfo( } } // namespace xml -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/base/xml/xml_node.h b/packager/mpd/base/xml/xml_node.h index e0d481ef97..17d8729b04 100644 --- a/packager/mpd/base/xml/xml_node.h +++ b/packager/mpd/base/xml/xml_node.h @@ -19,7 +19,7 @@ #include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/xml/scoped_xml_ptr.h" -namespace edash_packager { +namespace shaka { struct SegmentInfo; @@ -172,5 +172,5 @@ class RepresentationXmlNode : public RepresentationBaseXmlNode { }; } // namespace xml -} // namespace edash_packager +} // namespace shaka #endif // MPD_BASE_XML_XML_NODE_H_ diff --git a/packager/mpd/base/xml/xml_node_unittest.cc b/packager/mpd/base/xml/xml_node_unittest.cc index 71e38aed60..190a339716 100644 --- a/packager/mpd/base/xml/xml_node_unittest.cc +++ b/packager/mpd/base/xml/xml_node_unittest.cc @@ -15,7 +15,7 @@ #include "packager/mpd/base/xml/xml_node.h" #include "packager/mpd/test/xml_compare.h" -namespace edash_packager { +namespace shaka { namespace xml { namespace { @@ -257,4 +257,4 @@ TEST_F(RepresentationTest, InvalidLiveInitSegmentName) { } } // namespace xml -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/test/mpd_builder_test_helper.cc b/packager/mpd/test/mpd_builder_test_helper.cc index a82e3359a2..b66cd61b81 100644 --- a/packager/mpd/test/mpd_builder_test_helper.cc +++ b/packager/mpd/test/mpd_builder_test_helper.cc @@ -16,7 +16,7 @@ #include "packager/mpd/base/xml/scoped_xml_ptr.h" #include "packager/mpd/test/xml_compare.h" -namespace edash_packager { +namespace shaka { base::FilePath GetTestDataFilePath(const std::string& file_name) { base::FilePath file_path; @@ -113,4 +113,4 @@ void ExpectMpdToEqualExpectedOutputFile( << "Actual:" << std::endl << mpd_string; } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/test/mpd_builder_test_helper.h b/packager/mpd/test/mpd_builder_test_helper.h index e2842ad6bb..7dec152d69 100644 --- a/packager/mpd/test/mpd_builder_test_helper.h +++ b/packager/mpd/test/mpd_builder_test_helper.h @@ -11,7 +11,7 @@ #include "packager/base/files/file_path.h" -namespace edash_packager { +namespace shaka { class MediaInfo; @@ -71,6 +71,6 @@ void ExpectMpdToEqualExpectedOutputFile( const std::string& mpd_string, const std::string& expected_output_file); -} // namespace edash_packager +} // namespace shaka #endif // MPD_TEST_MPD_BUILDER_TEST_HELPER_H_ diff --git a/packager/mpd/test/xml_compare.cc b/packager/mpd/test/xml_compare.cc index c2a37739f7..fb6670d9ce 100644 --- a/packager/mpd/test/xml_compare.cc +++ b/packager/mpd/test/xml_compare.cc @@ -12,7 +12,7 @@ #include "packager/base/strings/string_util.h" #include "packager/mpd/base/xml/scoped_xml_ptr.h" -namespace edash_packager { +namespace shaka { namespace { xml::scoped_xml_ptr GetDocFromString(const std::string& xml_str) { @@ -168,4 +168,4 @@ bool XmlEqual(xmlDocPtr xml1, xmlDocPtr xml2) { return CompareNodes(xml1_root_element, xml2_root_element); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/test/xml_compare.h b/packager/mpd/test/xml_compare.h index d228dac79e..4c01be3d9a 100644 --- a/packager/mpd/test/xml_compare.h +++ b/packager/mpd/test/xml_compare.h @@ -5,7 +5,7 @@ #include -namespace edash_packager { +namespace shaka { /// Checks whether the XMLs are equivalent. An XML schema can specify strict /// ordering of children and MPD does. These functions are currently tuned to @@ -19,6 +19,6 @@ bool XmlEqual(const std::string& xml1, const std::string& xml2); bool XmlEqual(const std::string& xml1, xmlDocPtr xml2); bool XmlEqual(xmlDocPtr xml1, xmlDocPtr xml2); -} // namespace edash_packager +} // namespace shaka #endif // MPD_TEST_XML_COMPARE_H_ diff --git a/packager/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc index 78b0cc22e7..baf3513d07 100644 --- a/packager/mpd/util/mpd_writer.cc +++ b/packager/mpd/util/mpd_writer.cc @@ -25,7 +25,7 @@ DEFINE_bool(generate_dash_if_iop_compliant_mpd, "and does not guarantee compliance. Off by default until players " "support IOP MPDs."); -namespace edash_packager { +namespace shaka { namespace { @@ -126,4 +126,4 @@ void MpdWriter::SetMpdNotifierFactoryForTest( notifier_factory_ = factory.Pass(); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/mpd/util/mpd_writer.h b/packager/mpd/util/mpd_writer.h index 3bac92464e..d4cad875b7 100644 --- a/packager/mpd/util/mpd_writer.h +++ b/packager/mpd/util/mpd_writer.h @@ -18,7 +18,7 @@ #include "packager/mpd/base/mpd_notifier.h" #include "packager/mpd/base/mpd_options.h" -namespace edash_packager { +namespace shaka { namespace media { class File; @@ -87,6 +87,6 @@ class MpdWriter { DISALLOW_COPY_AND_ASSIGN(MpdWriter); }; -} // namespace edash_packager +} // namespace shaka #endif // MPD_UTIL_MPD_WRITER_H_ diff --git a/packager/mpd/util/mpd_writer_unittest.cc b/packager/mpd/util/mpd_writer_unittest.cc index bcb3bd0bec..81389ddd82 100644 --- a/packager/mpd/util/mpd_writer_unittest.cc +++ b/packager/mpd/util/mpd_writer_unittest.cc @@ -15,7 +15,7 @@ #include "packager/mpd/test/mpd_builder_test_helper.h" #include "packager/mpd/util/mpd_writer.h" -namespace edash_packager { +namespace shaka { using ::testing::_; using ::testing::Invoke; @@ -102,4 +102,4 @@ TEST_F(MpdWriterTest, WriteMpdToFile) { EXPECT_TRUE(mpd_writer_.WriteMpdToFile(mpd_file_path.value().c_str())); } -} // namespace edash_packager +} // namespace shaka diff --git a/packager/version/version.cc b/packager/version/version.cc index a39833a311..9e700230dc 100644 --- a/packager/version/version.cc +++ b/packager/version/version.cc @@ -6,7 +6,7 @@ #include "packager/version/version.h" -namespace edash_packager { +namespace shaka { #if defined(PACKAGER_VERSION) // PACKAGER_VERSION is generated in gyp file using script @@ -20,4 +20,4 @@ const char kPackagerVersion[] = PACKAGER_VERSION "-debug"; const char kPackagerVersion[] = ""; #endif // #if defined(PACKAGER_VERSION) -} // namespace edash_packager +} // namespace shaka diff --git a/packager/version/version.h b/packager/version/version.h index 61bf3ea589..31d91dc55e 100644 --- a/packager/version/version.h +++ b/packager/version/version.h @@ -4,8 +4,8 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -namespace edash_packager { +namespace shaka { extern const char kPackagerVersion[]; -} // namespace edash_packager +} // namespace shaka