From 77ee2400df7e5b42791a591388c7d2a12f08a983 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 9 May 2015 23:12:12 +0800 Subject: [PATCH] fix the unicode to ascii --- trunk/src/app/srs_app_mpegts_udp.cpp | 8 ++++---- trunk/src/app/srs_app_utility.hpp | 10 +++++----- trunk/src/kernel/srs_kernel_codec.hpp | 4 ++-- trunk/src/kernel/srs_kernel_ts.cpp | 2 +- trunk/src/kernel/srs_kernel_ts.hpp | 6 +++--- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/main/srs_main_ingest_hls.cpp | 8 ++++---- trunk/src/protocol/srs_raw_avc.cpp | 4 ++-- trunk/src/protocol/srs_rtmp_stack.cpp | 8 ++++---- trunk/src/protocol/srs_rtmp_stack.hpp | 26 ++++++++++++------------- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp index 4b33f1089..c9404d948 100644 --- a/trunk/src/app/srs_app_mpegts_udp.cpp +++ b/trunk/src/app/srs_app_mpegts_udp.cpp @@ -265,8 +265,8 @@ int SrsMpegtsOverUdp::on_ts_message(SrsTsMessage* msg) // because when audio stream_number is 0, the elementary is ADTS(aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 75, 1.A.2.2 ADTS). // about the bytes of PES_packet_data_byte, defined in hls-mpeg-ts-iso13818-1.pdf, page 58 - // PES_packet_data_byte C PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream - // indicated by the packets stream_id or PID. When the elementary stream data conforms to ITU-T + // PES_packet_data_byte "C PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream + // indicated by the packets stream_id or PID. When the elementary stream data conforms to ITU-T // Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 13818-3, the PES_packet_data_bytes shall be byte aligned to the bytes of this // Recommendation | International Standard. The byte-order of the elementary stream shall be preserved. The number of // PES_packet_data_bytes, N, is specified by the PES_packet_length field. N shall be equal to the value indicated in the @@ -277,12 +277,12 @@ int SrsMpegtsOverUdp::on_ts_message(SrsTsMessage* msg) // PES_packet_data_byte field are user definable and will not be specified by ITU-T | ISO/IEC in the future. // about the bytes of stream_id, define in hls-mpeg-ts-iso13818-1.pdf, page 49 - // stream_id C In Program Streams, the stream_id specifies the type and number of the elementary stream as defined by the + // stream_id "C In Program Streams, the stream_id specifies the type and number of the elementary stream as defined by the // stream_id Table 2-18. In Transport Streams, the stream_id may be set to any valid value which correctly describes the // elementary stream type as defined in Table 2-18. In Transport Streams, the elementary stream type is specified in the // Program Specific Information as specified in 2.4.4. - // about the stream_id table, define in Table 2-18 C Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. + // about the stream_id table, define in Table 2-18 "C Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. // // 110x xxxx // ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp index 4c3e6fb8c..e86519db0 100644 --- a/trunk/src/app/srs_app_utility.hpp +++ b/trunk/src/app/srs_app_utility.hpp @@ -143,11 +143,11 @@ public: // minflt %lu The number of minor faults the process has made which have not required loading a memory page from // disk. unsigned long minflt; - // cminflt %lu The number of minor faults that the process’s waited-for children have made. + // cminflt %lu The number of minor faults that the process's waited-for children have made. unsigned long cminflt; // majflt %lu The number of major faults the process has made which have required loading a memory page from disk. unsigned long majflt; - // cmajflt %lu The number of major faults that the process’s waited-for children have made. + // cmajflt %lu The number of major faults that the process's waited-for children have made. unsigned long cmajflt; // utime %lu Amount of time that this process has been scheduled in user mode, measured in clock ticks (divide by // sysconf(_SC_CLK_TCK). This includes guest time, guest_time (time spent running a virtual CPU, see @@ -157,11 +157,11 @@ public: // stime %lu Amount of time that this process has been scheduled in kernel mode, measured in clock ticks (divide by // sysconf(_SC_CLK_TCK). unsigned long stime; - // cutime %ld Amount of time that this process’s waited-for children have been scheduled in user mode, measured in + // cutime %ld Amount of time that this process's waited-for children have been scheduled in user mode, measured in // clock ticks (divide by sysconf(_SC_CLK_TCK). (See also times(2).) This includes guest time, // cguest_time (time spent running a virtual CPU, see below). long cutime; - // cstime %ld Amount of time that this process’s waited-for children have been scheduled in kernel mode, measured in + // cstime %ld Amount of time that this process's waited-for children have been scheduled in kernel mode, measured in // clock ticks (divide by sysconf(_SC_CLK_TCK). long cstime; // priority %ld @@ -251,7 +251,7 @@ public: // clock ticks (divide by sysconf(_SC_CLK_TCK). unsigned long guest_time; // cguest_time %ld (since Linux 2.6.24) - // Guest time of the process’s children, measured in clock ticks (divide by sysconf(_SC_CLK_TCK). + // Guest time of the process's children, measured in clock ticks (divide by sysconf(_SC_CLK_TCK). long cguest_time; public: diff --git a/trunk/src/kernel/srs_kernel_codec.hpp b/trunk/src/kernel/srs_kernel_codec.hpp index 5f654db3e..e45493c4d 100644 --- a/trunk/src/kernel/srs_kernel_codec.hpp +++ b/trunk/src/kernel/srs_kernel_codec.hpp @@ -276,7 +276,7 @@ enum SrsCodecAudioSoundType }; /** - * Table 7-1 – NAL unit type codes, syntax element categories, and NAL unit type classes + * Table 7-1 - NAL unit type codes, syntax element categories, and NAL unit type classes * H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 83. */ enum SrsAvcNaluType @@ -448,7 +448,7 @@ enum SrsAacObjectType { SrsAacObjectTypeReserved = 0, - // Table 1.1 – Audio Object Type definition + // Table 1.1 - Audio Object Type definition // @see @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 23 SrsAacObjectTypeAacMain = 1, SrsAacObjectTypeAacLC = 2, diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 8eb3c7bcb..243c2ec76 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -2898,7 +2898,7 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample) * xxxxxxx // data bytes. * * nal_unit_type specifies the type of RBSP data structure contained in the NAL unit as specified in Table 7-1. - * Table 7-1 – NAL unit type codes, syntax element categories, and NAL unit type classes + * Table 7-1 - NAL unit type codes, syntax element categories, and NAL unit type classes * H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 83. * 1, Coded slice of a non-IDR picture slice_layer_without_partitioning_rbsp( ) * 2, Coded slice data partition A slice_data_partition_a_layer_rbsp( ) diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index 4f4bda647..f042256d8 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -182,7 +182,7 @@ struct SrsTsChannel /** * the stream_id of PES payload of ts packet. -* Table 2-18 – Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. +* Table 2-18 - Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. */ enum SrsTsPESStreamId { @@ -236,7 +236,7 @@ enum SrsTsPESStreamId // FlexMux_stream SrsTsPESStreamIdFlexMuxStream = 0xfb, // 0b11111011 // reserved data stream - // 1111 1100 … 1111 1110 + // 1111 1100 ... 1111 1110 // program_stream_directory SrsTsPESStreamIdProgramStreamDirectory = 0xff, // 0b11111111 }; @@ -1208,7 +1208,7 @@ public: // NB /** * PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream - * indicated by the packet’s stream_id or PID. When the elementary stream data conforms to ITU-T + * indicated by the packet's stream_id or PID. When the elementary stream data conforms to ITU-T * Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 13818-3, the PES_packet_data_bytes shall be byte aligned to the bytes of this * Recommendation | International Standard. The byte-order of the elementary stream shall be preserved. The number of * PES_packet_data_bytes, N, is specified by the PES_packet_length field. N shall be equal to the value indicated in the diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index c47a81ca2..58fb3fa6a 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -61,7 +61,7 @@ int srs_avc_nalu_read_uev(SrsBitStream* stream, int32_t& v) // for( b = 0; !b; leadingZeroBits++ ) // b = read_bits( 1 ) // The variable codeNum is then assigned as follows: - // codeNum = (2<empty(); leadingZeroBits++) { b = stream->read_bit(); diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index 4de2740ca..e01515470 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -723,8 +723,8 @@ int SrsIngestSrsOutput::on_ts_message(SrsTsMessage* msg) // because when audio stream_number is 0, the elementary is ADTS(aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 75, 1.A.2.2 ADTS). // about the bytes of PES_packet_data_byte, defined in hls-mpeg-ts-iso13818-1.pdf, page 58 - // PES_packet_data_byte ¨C PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream - // indicated by the packet¡¯s stream_id or PID. When the elementary stream data conforms to ITU-T + // PES_packet_data_byte "C PES_packet_data_bytes shall be contiguous bytes of data from the elementary stream + // indicated by the packets stream_id or PID. When the elementary stream data conforms to ITU-T // Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 13818-3, the PES_packet_data_bytes shall be byte aligned to the bytes of this // Recommendation | International Standard. The byte-order of the elementary stream shall be preserved. The number of // PES_packet_data_bytes, N, is specified by the PES_packet_length field. N shall be equal to the value indicated in the @@ -735,12 +735,12 @@ int SrsIngestSrsOutput::on_ts_message(SrsTsMessage* msg) // PES_packet_data_byte field are user definable and will not be specified by ITU-T | ISO/IEC in the future. // about the bytes of stream_id, define in hls-mpeg-ts-iso13818-1.pdf, page 49 - // stream_id ¨C In Program Streams, the stream_id specifies the type and number of the elementary stream as defined by the + // stream_id "C In Program Streams, the stream_id specifies the type and number of the elementary stream as defined by the // stream_id Table 2-18. In Transport Streams, the stream_id may be set to any valid value which correctly describes the // elementary stream type as defined in Table 2-18. In Transport Streams, the elementary stream type is specified in the // Program Specific Information as specified in 2.4.4. - // about the stream_id table, define in Table 2-18 ¨C Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. + // about the stream_id table, define in Table 2-18 "C Stream_id assignments, hls-mpeg-ts-iso13818-1.pdf, page 52. // // 110x xxxx // ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC diff --git a/trunk/src/protocol/srs_raw_avc.cpp b/trunk/src/protocol/srs_raw_avc.cpp index 0d834c8b8..882b9a606 100644 --- a/trunk/src/protocol/srs_raw_avc.cpp +++ b/trunk/src/protocol/srs_raw_avc.cpp @@ -358,8 +358,8 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame int8_t protection_absent = pav & 0x01; /** - * ID: MPEG identifier, set to ‘1’ if the audio data in the ADTS stream are MPEG-2 AAC (See ISO/IEC 13818-7) - * and set to ‘0’ if the audio data are MPEG-4. See also ISO/IEC 11172-3, subclause 2.4.2.3. + * ID: MPEG identifier, set to '1' if the audio data in the ADTS stream are MPEG-2 AAC (See ISO/IEC 13818-7) + * and set to '0' if the audio data are MPEG-4. See also ISO/IEC 11172-3, subclause 2.4.2.3. */ if (id != 0x01) { srs_info("adts: id must be 1(aac), actual 0(mp4a). ret=%d", ret); diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 332f458c0..2c9d6098b 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -1445,7 +1445,7 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg) * Header field may be 1, 2, or 3 bytes, depending on the chunk stream * ID. * -* The bits 0–5 (least significant) in the chunk basic header represent +* The bits 0-5 (least significant) in the chunk basic header represent * the chunk stream ID. * * Chunk stream IDs 2-63 can be encoded in the 1-byte version of this @@ -1651,14 +1651,14 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt) // timestamp: 3 bytes // If the timestamp is greater than or equal to 16777215 // (hexadecimal 0x00ffffff), this value MUST be 16777215, and the - // ‘extended timestamp header’ MUST be present. Otherwise, this value + // 'extended timestamp header' MUST be present. Otherwise, this value // SHOULD be the entire timestamp. // // fmt: 1 or 2 // timestamp delta: 3 bytes // If the delta is greater than or equal to 16777215 (hexadecimal - // 0x00ffffff), this value MUST be 16777215, and the ‘extended - // timestamp header’ MUST be present. Otherwise, this value SHOULD be + // 0x00ffffff), this value MUST be 16777215, and the 'extended + // timestamp header' MUST be present. Otherwise, this value SHOULD be // the entire delta. chunk->extended_timestamp = (chunk->header.timestamp_delta >= RTMP_EXTENDED_TIMESTAMP); if (!chunk->extended_timestamp) { diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index 2026f950b..8d673e402 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -725,7 +725,7 @@ class SrsConnectAppPacket : public SrsPacket { public: /** - * Name of the command. Set to “connect”. + * Name of the command. Set to "connect". */ std::string command_name; /** @@ -778,8 +778,8 @@ public: */ SrsAmf0Object* props; /** - * Name-value pairs that describe the response from|the server. ‘code’, - * ‘level’, ‘description’ are names of few among such information. + * Name-value pairs that describe the response from|the server. 'code', + * 'level', 'description' are names of few among such information. * @remark, never be NULL. */ SrsAmf0Object* info; @@ -887,7 +887,7 @@ class SrsCreateStreamPacket : public SrsPacket { public: /** - * Name of the command. Set to “createStream”. + * Name of the command. Set to "createStream". */ std::string command_name; /** @@ -958,7 +958,7 @@ class SrsCloseStreamPacket : public SrsPacket { public: /** - * Name of the command, set to “closeStream”. + * Name of the command, set to "closeStream". */ std::string command_name; /** @@ -1069,7 +1069,7 @@ class SrsPublishPacket : public SrsPacket { public: /** - * Name of the command, set to “publish”. + * Name of the command, set to "publish". */ std::string command_name; /** @@ -1086,7 +1086,7 @@ public: */ std::string stream_name; /** - * Type of publishing. Set to “live”, “record”, or “append”. + * Type of publishing. Set to "live", "record", or "append". * record: The stream is published and the data is recorded to a new file.The file * is stored on the server in a subdirectory within the directory that * contains the server application. If the file already exists, it is @@ -1122,7 +1122,7 @@ class SrsPausePacket : public SrsPacket { public: /** - * Name of the command, set to “pause”. + * Name of the command, set to "pause". */ std::string command_name; /** @@ -1161,7 +1161,7 @@ class SrsPlayPacket : public SrsPacket { public: /** - * Name of the command. Set to “play”. + * Name of the command. Set to "play". */ std::string command_name; /** @@ -1325,7 +1325,7 @@ public: SrsAmf0Any* args; // null /** * Name-value pairs that describe the response from the server. - * ‘code’,‘level’, ‘description’ are names of few among such information. + * 'code','level', 'description' are names of few among such information. * @remark, never be NULL, an AMF0 object instance. */ SrsAmf0Object* data; @@ -1367,7 +1367,7 @@ public: SrsAmf0Any* args; // null /** * Name-value pairs that describe the response from the server. - * ‘code’,‘level’, ‘description’ are names of few among such information. + * 'code','level', 'description' are names of few among such information. * @remark, never be NULL, an AMF0 object instance. */ SrsAmf0Object* data; @@ -1425,7 +1425,7 @@ public: std::string command_name; /** * Name-value pairs that describe the response from the server. - * ‘code’, are names of few among such information. + * 'code', are names of few among such information. * @remark, never be NULL, an AMF0 object instance. */ SrsAmf0Object* data; @@ -1707,7 +1707,7 @@ enum SrcPCUCEventType * +------------------------------+------------------------- * | Event Type ( 2- bytes ) | Event Data * +------------------------------+------------------------- -* Figure 5 Pay load for the ‘User Control Message’. +* Figure 5 Pay load for the 'User Control Message'. */ class SrsUserControlPacket : public SrsPacket {