external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine params nameing and SrsStream.

Browse source
This commit is contained in:
winlin 2015-07-28 18:08:11 +08:00
parent 8d86eb6516
commit bfe0f97edd
7 changed files with 57 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/kernel/srs_kernel_mp3.cpp
View file

@ -40,7 +40,7 @@ using namespace std;
SrsMp3Encoder::SrsMp3Encoder()
{
_fs = NULL;
writer = NULL;
tag_stream = new SrsStream();
}
@ -49,19 +49,19 @@ SrsMp3Encoder::~SrsMp3Encoder()
srs_freep(tag_stream);
}
int SrsMp3Encoder::initialize(SrsFileWriter* fs)
int SrsMp3Encoder::initialize(SrsFileWriter* fw)
{
int ret = ERROR_SUCCESS;
srs_assert(fs);
srs_assert(fw);
if (!fs->is_open()) {
if (!fw->is_open()) {
ret = ERROR_KERNEL_MP3_STREAM_CLOSED;
srs_warn("stream is not open for encoder. ret=%d", ret);
return ret;
}
_fs = fs;
writer = fw;
return ret;
}
@ -78,7 +78,7 @@ int SrsMp3Encoder::write_header()
(char)0x00, (char)0x00, (char)0x00, (char)0x00, // FrameSize
(char)0x00, (char)0x00 // Flags
};
return _fs->write(id3, sizeof(id3), NULL);
return writer->write(id3, sizeof(id3), NULL);
}
int SrsMp3Encoder::write_audio(int64_t timestamp, char* data, int size)
@ -122,6 +122,6 @@ int SrsMp3Encoder::write_audio(int64_t timestamp, char* data, int size)
return ret;
}
return _fs->write(data + stream->pos(), size - stream->pos(), NULL);
return writer->write(data + stream->pos(), size - stream->pos(), NULL);
}