diff --git a/trunk/src/app/srs_app_rtc_codec.cpp b/trunk/src/app/srs_app_rtc_codec.cpp index 7c0db4454..061debfab 100644 --- a/trunk/src/app/srs_app_rtc_codec.cpp +++ b/trunk/src/app/srs_app_rtc_codec.cpp @@ -395,7 +395,7 @@ srs_error_t SrsAudioRecode::transcode(SrsSample *pkt, char **buf, int *buf_len, int decode_len = kPacketBufMax; static char decode_buffer[kPacketBufMax]; if ((err = dec_->decode(pkt, decode_buffer, decode_len)) != srs_success) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "decode error"); + return srs_error_wrap(err, "decode error"); } if (!resample_) { @@ -419,7 +419,7 @@ srs_error_t SrsAudioRecode::transcode(SrsSample *pkt, char **buf, int *buf_len, int resample_len = kFrameBufMax; static char resample_buffer[kFrameBufMax]; if ((err = resample_->resample(&pcm, resample_buffer, resample_len)) != srs_success) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "resample error"); + return srs_error_wrap(err, "resample error"); } n = 0; @@ -446,7 +446,7 @@ srs_error_t SrsAudioRecode::transcode(SrsSample *pkt, char **buf, int *buf_len, pcm.size = size_; static char encode_buffer[kPacketBufMax]; if ((err = enc_->encode(&pcm, encode_buffer, encode_len)) != srs_success) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "encode error"); + return srs_error_wrap(err, "encode error"); } memcpy(buf[n], encode_buffer, encode_len); diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 3fa14461e..39eb011ce 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -539,7 +539,7 @@ srs_error_t SrsInotifyWorker::start() } if (((err = srs_fd_closeexec(fd))) != srs_success) { - return srs_error_new(ERROR_INOTIFY_OPENFD, "closeexec fd=%d", fd); + return srs_error_wrap(err, "closeexec fd=%d", fd); } // /* the following are legal, implemented events that user-space can watch for */ diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp index 785d21eef..e5e657d94 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp @@ -1032,7 +1032,7 @@ srs_error_t SrsRtcpTWCC::process_pkt_chunk(SrsRtcpTWCC::SrsRtcpTWCCChunk& chunk, return err; } if ((err = encode_chunk(chunk)) != srs_success) { - return srs_error_new(ERROR_RTC_RTCP, "encode chunk, delta_size %u", delta_size); + return srs_error_wrap(err, "encode chunk, delta_size %u", delta_size); } add_to_chunk(chunk, delta_size); return err; @@ -1118,7 +1118,7 @@ srs_error_t SrsRtcpTWCC::do_encode(SrsBuffer *buffer) // FIXME 24-bit base receive delta not supported int recv_delta_size = (delta >= 0 && delta <= 0xff) ? 1 : 2; if ((err = process_pkt_chunk(chunk, recv_delta_size)) != srs_success) { - return srs_error_new(ERROR_RTC_RTCP, "delta_size %d, failed to append_recv_delta", recv_delta_size); + return srs_error_wrap(err, "delta_size %d, failed to append_recv_delta", recv_delta_size); } pkt_deltas_.push_back(delta); diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index f56fcdcb4..f80cf77cd 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -3977,7 +3977,7 @@ srs_error_t SrsPlayPacket::decode(SrsBuffer* stream) SrsAmf0Any* reset_value = NULL; if ((err = srs_amf0_read_any(stream, &reset_value)) != srs_success) { - return srs_error_new(ERROR_RTMP_AMF0_DECODE, "reset"); + return srs_error_wrap(err, "reset"); } SrsAutoFree(SrsAmf0Any, reset_value);