93d87df37a
Resolves the problem of the file offset being set to a large value if readAt returns an error instead of number of bytes read. I haven't been able to repro the failure yet since putting in this fix, so we still need to confirm that the player recovers correctly when the server error occurs. Change-Id: I963191144835a89310ad1b0ea0863dd536dff564
66 lines
1.5 KiB
C++
66 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#define LOG_TAG "WVMFileSource"
|
|
#include <utils/Log.h>
|
|
|
|
#include "WVMFileSource.h"
|
|
#include "media/stagefright/MediaErrors.h"
|
|
#include "media/stagefright/MediaDefs.h"
|
|
#include "media/stagefright/MediaDebug.h"
|
|
|
|
namespace android {
|
|
|
|
|
|
WVMFileSource::WVMFileSource(sp<DataSource> &dataSource)
|
|
: mDataSource(dataSource),
|
|
mOffset(0)
|
|
{
|
|
}
|
|
|
|
unsigned long long WVMFileSource::GetSize()
|
|
{
|
|
off64_t size;
|
|
mDataSource->getSize(&size);
|
|
return size;
|
|
}
|
|
|
|
unsigned long long WVMFileSource::GetOffset()
|
|
{
|
|
return mOffset;
|
|
}
|
|
|
|
void WVMFileSource::Seek(unsigned long long offset)
|
|
{
|
|
mOffset = offset;
|
|
}
|
|
|
|
size_t WVMFileSource::Read(size_t amount, unsigned char *buffer)
|
|
{
|
|
ssize_t result = mDataSource->readAt(mOffset, buffer, amount);
|
|
|
|
if (result < 0) {
|
|
LOGE("mDataSource-readAt returned error %d\n", (int)result );
|
|
result = 0;
|
|
} else {
|
|
mOffset += result;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace android
|