i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TrackerReader: style fixes, no functional changes intended

Browse Source
This commit is contained in:
Philippe Saint-Pierre
2013-07-17 16:58:41 -04:00
parent cd15d8c3d0
commit a71f2ed86a
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/TrackReader.cpp
+31 -21
View File
@@ -31,10 +31,10 @@
* The undocumented BTrackReader class,
* used by BSound and the GameSound classes
*/
#include <File.h>
#include <MediaTrack.h>
#include <MediaFile.h>
#include <File.h>
#include <string.h>
#include "TrackReader.h"
#include "debug.h"
@@ -69,6 +69,7 @@ BTrackReader::BTrackReader(BMediaTrack *track, media_raw_audio_format const &for
TRACE("BTrackReader::BTrackReader successful\n");
}
BTrackReader::BTrackReader(BFile *file, media_raw_audio_format const &format) :
fFrameSize(0),
fBuffer(0),
@@ -129,16 +130,17 @@ BTrackReader::BTrackReader(BFile *file, media_raw_audio_format const &format) :
TRACE("BTrackReader::BTrackReader successful\n");
}
void
BTrackReader::SetToTrack(BMediaTrack *track)
{
media_format fmt;
memset(&fmt,0,sizeof(fmt)); //wildcard
memcpy(&fmt.u.raw_audio,&fFormat,sizeof(fFormat));
memset(&fmt, 0, sizeof(fmt)); //wildcard
memcpy(&fmt.u.raw_audio, &fFormat, sizeof(fFormat));
fmt.type = B_MEDIA_RAW_AUDIO;
//try to find a output format
if (B_OK == track->DecodedFormat(&fmt)) {
memcpy(&fFormat,&fmt.u.raw_audio,sizeof(fFormat));
if (track->DecodedFormat(&fmt) == B_OK) {
memcpy(&fFormat, &fmt.u.raw_audio, sizeof(fFormat));
fMediaTrack = track;
return;
}
@@ -146,8 +148,8 @@ BTrackReader::SetToTrack(BMediaTrack *track)
//try again
fmt.u.raw_audio.buffer_size = 2 * 4096;
fmt.u.raw_audio.format = media_raw_audio_format::B_AUDIO_FLOAT;
if (B_OK == track->DecodedFormat(&fmt)) {
memcpy(&fFormat,&fmt.u.raw_audio,sizeof(fFormat));
if (track->DecodedFormat(&fmt) == B_OK) {
memcpy(&fFormat, &fmt.u.raw_audio, sizeof(fFormat));
fMediaTrack = track;
return;
}
@@ -155,8 +157,8 @@ BTrackReader::SetToTrack(BMediaTrack *track)
//try again
fmt.u.raw_audio.buffer_size = 4096;
fmt.u.raw_audio.format = media_raw_audio_format::B_AUDIO_SHORT;
if (B_OK == track->DecodedFormat(&fmt)) {
memcpy(&fFormat,&fmt.u.raw_audio,sizeof(fFormat));
if (track->DecodedFormat(&fmt) == B_OK) {
memcpy(&fFormat, &fmt.u.raw_audio, sizeof(fFormat));
fMediaTrack = track;
return;
}
@@ -165,15 +167,17 @@ BTrackReader::SetToTrack(BMediaTrack *track)
ERROR("BTrackReader::SetToTrack failed\n");
}
BTrackReader::~BTrackReader()
{
CALLED();
if (fMediaFile && fMediaTrack)
fMediaFile->ReleaseTrack(fMediaTrack);
delete fMediaFile;
delete [] fBuffer;
delete[] fBuffer;
}
status_t
BTrackReader::InitCheck()
{
@@ -181,6 +185,7 @@ BTrackReader::InitCheck()
return fMediaTrack ? fMediaTrack->InitCheck() : B_ERROR;
}
int64
BTrackReader::CountFrames(void)
{
@@ -188,6 +193,7 @@ BTrackReader::CountFrames(void)
return fMediaTrack ? fMediaTrack->CountFrames() : 0;
}
const media_raw_audio_format &
BTrackReader::Format(void) const
{
@@ -195,6 +201,7 @@ BTrackReader::Format(void) const
return fFormat;
}
int32
BTrackReader::FrameSize(void)
{
@@ -202,19 +209,20 @@ BTrackReader::FrameSize(void)
return fFrameSize;
}
status_t
BTrackReader::ReadFrames(void *in_buffer, int32 frame_count)
BTrackReader::ReadFrames(void* in_buffer, int32 frame_count)
{
CALLED();
uint8 *buffer = static_cast<uint8 *>(in_buffer);
uint8* buffer = static_cast<uint8*>(in_buffer);
int32 bytes_to_read = frame_count * fFrameSize;
status_t last_status = B_OK;
while (bytes_to_read > 0) {
int32 bytes_to_copy = min_c(fBufferUsedSize,bytes_to_read);
int32 bytes_to_copy = min_c(fBufferUsedSize, bytes_to_read);
if (bytes_to_copy > 0) {
memcpy(buffer,fBuffer + fBufferOffset,bytes_to_copy);
memcpy(buffer, fBuffer + fBufferOffset, bytes_to_copy);
buffer += bytes_to_copy;
bytes_to_read -= bytes_to_copy;
fBufferOffset += bytes_to_copy;
@@ -224,21 +232,22 @@ BTrackReader::ReadFrames(void *in_buffer, int32 frame_count)
break;
if (fBufferUsedSize == 0) {
int64 outFrameCount;
last_status = fMediaTrack->ReadFrames(fBuffer,&outFrameCount);
last_status = fMediaTrack->ReadFrames(fBuffer,
&outFrameCount);
fBufferOffset = 0;
fBufferUsedSize = outFrameCount * fFrameSize;
}
}
if (bytes_to_read > 0) {
memset(buffer,0,bytes_to_read);
memset(buffer, 0, bytes_to_read);
return B_LAST_BUFFER_ERROR;
} else {
return B_OK;
}
return B_OK;
}
status_t
BTrackReader::SeekToFrame(int64 *in_out_frame)
BTrackReader::SeekToFrame(int64* in_out_frame)
{
CALLED();
status_t s = fMediaTrack->SeekToFrame(in_out_frame, B_MEDIA_SEEK_CLOSEST_BACKWARD);
@@ -249,7 +258,8 @@ BTrackReader::SeekToFrame(int64 *in_out_frame)
return B_OK;
}
BMediaTrack *
BMediaTrack*
BTrackReader::Track(void)
{
CALLED();