FCL/sf/os/mm: comparison mmplugins/lib3gp/impl/src/filewriter.cpp

equal deleted inserted replaced

-:f429a0a2075b
+:735348f59235
 // CFileWriter::CFileWriter
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-CFileWriter::CFileWriter( TInt aInitSetSize, TInt aOutputBufferSizeSmall, TInt aOutputBufferSizeLarge ):
+CFileWriter::CFileWriter() : CActive( EPriorityHigh )
-	CActive( EPriorityHigh ),
-	iSetSize( aInitSetSize ),
-	iOutputBufferSizeSmall( aOutputBufferSizeSmall ),
-	iOutputBufferSizeLarge( aOutputBufferSizeLarge )
 {
 }
 // -----------------------------------------------------------------------------
 // CFileWriter::ConstructL
 void CFileWriter::ConstructL( RFile64& aFile )
 {
 PRINT((_L("CFileWriter::ConstructL() in")));
 iFlush = EFalse;
 iError = KErrNone;
 iOutputFile = &aFile;
 iWritingStarted = EFalse;
 iOutputBufferSize = KFileWriterBufferSizeSmall;
 iMaxOutputBufHardLimit = KFileWriterHardBufLimit;
 iMaxOutputBufSoftLimit = KFileWriterSoftBufLimit;
 // -----------------------------------------------------------------------------
 // CFileWriter::NewL
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CFileWriter* CFileWriter::NewL( RFile64& aFile, TInt aInitSetSize, TInt aOutputBufferSizeSmall, TInt aOutputBufferSizeLarge )
+CFileWriter* CFileWriter::NewL( RFile64& aFile )
 {
-CFileWriter* self = new(ELeave) CFileWriter( aInitSetSize, aOutputBufferSizeSmall, aOutputBufferSizeLarge );
+CFileWriter* self = new(ELeave) CFileWriter;
 CleanupStack::PushL(self);
 self->ConstructL( aFile );
 CleanupStack::Pop(self);
 return self;
 }
 iEmptyBufferQueue.ResetAndDestroy();
 iFullBufferQueue.ResetAndDestroy();
 PRINT((_L("CFileWriter::~CFileWriter() out")));
 }
-// -----------------------------------------------------------------------------
-// CFileWriter::UpdateOutputFileSize()
-// Updates output file size and reserves extra space for following writing
-// if iSetSize is set.
-// Takes into account if the position in the file was changed.
-// -----------------------------------------------------------------------------
-//
-void CFileWriter::UpdateOutputFileSize()
-{
-TInt64 pos = 0;
-PRINT((_L("e_cfilewriter_write_updateoutputfilesize_seek 1")));
-iOutputFile->Seek(ESeekCurrent, pos);
-PRINT((_L("e_cfilewriter_write_updateoutputfilesize_seek 0")));
-PRINT((_L("CFileWriter::UpdateOutputFileSize() pos: %Ld"), pos));
-PRINT((_L("CFileWriter::UpdateOutputFileSize() iOutputFileSize: %Ld"), iOutputFileSize));
-PRINT((_L("CFileWriter::UpdateOutputFileSize() iSetSize: %Ld"), iSetSize));
-if (pos > iOutputFileSize)
-{
-iOutputFileSize = pos;
-}
-while (iOutputFileSize >= iSetSize)
-{
-iSetSize += static_cast<TInt64>(iOutputBufferSize) * (static_cast<TInt64>(iMaxOutputBufHardLimit) >> 1);
-PRINT((_L("e_cfilewriter_updateoutputfilesize_setsize 1")));
-iOutputFile->SetSize( iSetSize );
-PRINT((_L("e_cfilewriter_updateoutputfilesize_setsize 0")));
-}
-}
 // -----------------------------------------------------------------------------
 // CFileWriter::Write( const TDesC8& aBuf )
 // Writes incoming buffer data to internal buffers for writing to disk.
 // (other items were commented in a header).
 error = iOutputFile->Write( *iFullBufferQueue[0] );
 PRINT((_L("e_cfilewriter_flush_writequeue_sync 0")));
 PRINT((_L("e_cfilewriter_flush_remove_buf 1")));
 if ( error == KErrNone )
 {
-UpdateOutputFileSize();
 iFullBufferQueue[0]->Des().Zero();
 if ( iEmptyBufferQueue.Append( iFullBufferQueue[0] ) )
 {
 PRINT(_L("CFileWriter::Flush() Append failed"));
 delete ( iFullBufferQueue[0] );
 PRINT((_L("e_cfilewriter_flush_writeinput_sync 1")));
 error = iOutputFile->Write( *iInputBuf );
 PRINT((_L("e_cfilewriter_flush_writeinput_sync 0")));
 if ( error == KErrNone )
 {
-UpdateOutputFileSize();
 iInputBuf->Des().Zero();
 }
 else
 {
 PRINT((_L("CFileWriter::Flush() inputbuf write failed, error: %d"), error));
 return KErrNotReady;
 }
 if ( aBufferSize == EBufferSizeSmall )
 {
-size = iOutputBufferSizeSmall;
+size = KFileWriterBufferSizeSmall;
 }
 else if ( aBufferSize == EBufferSizeLarge )
 {
-size = iOutputBufferSizeLarge;
+size = KFileWriterBufferSizeLarge;
 }
 else if ( aBufferSize == EBufferSizeCustom )
 {
 size = handle->mediaWriteBufferSize;
 }
 	return KErrNoMemory;
 	}
 while (byteswritten < aBuf.Length() )
 {
-available = iOutputBufferSize - iInputBuf->Length();
+available = (iInputBuf->Des()).MaxLength() - iInputBuf->Length();
 if (available > 0)
 {
 numbytes = aBuf.Length() - byteswritten;
 if (numbytes > available)
 	PRINT((_L("e_cfilewriter_runl 1")));
 iAsyncWritingOngoing = EFalse;
 if ( iStatus == KErrNone )
 {
-UpdateOutputFileSize();
+iOutputFileSize += iFullBufferQueue[0]->Des().Length();
 iFullBufferQueue[0]->Des().Zero();
 iError = iEmptyBufferQueue.Append( iFullBufferQueue[0] );
 if ( iError )
 {
 PRINT((_L("CFileWriter::RunL() Append failed 1 %d"), iError ));
 PRINT((_L("CFileWriter::RunL() Write error in previous async: %d "), iStatus.Int() ));
 iError = iStatus.Int();
 return;
 }
-PRINT((_L("CFileWriter::RunL() Buffer written, Status: Full:%d Empty:%d Filesize:%Ld"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
+PRINT((_L("CFileWriter::RunL() Buffer written, Status: Full:%d Empty:%d Filesize:%d"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
 if ( iFlush )
 {
 PRINT(_L("CFileWriter::RunL() out, flushing"));
 PRINT((_L("e_cfilewriter_runl 0")));
 PRINT((_L("e_cfilewriter_runl_write 1")));
 iError = iOutputFile->Write( *iFullBufferQueue[0]);
 PRINT((_L("e_cfilewriter_runl_write 0")));
 if ( iError == KErrNone )
 {
-UpdateOutputFileSize();
+iOutputFileSize += iFullBufferQueue[0]->Des().Length();
 iFullBufferQueue[0]->Des().Zero();
 iError = iEmptyBufferQueue.Append( iFullBufferQueue[0] );
 if ( iError )
 {
 PRINT((_L("CFileWriter::RunL() Append failed 2 %d"), iError));
 delete ( iFullBufferQueue[0] );
 iFullBufferQueue.Remove( 0 );
 return;
 }
 iFullBufferQueue.Remove( 0 );
-			PRINT((_L("CFileWriter::RunL() Hardlimit : Buffer sync written, Status: Full:%d Empty:%d Filesize:%Ld"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
+			PRINT((_L("CFileWriter::RunL() Hardlimit : Buffer sync written, Status: Full:%d Empty:%d Filesize:%d"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
 }
 else
 {
 PRINT((_L("CFileWriter::RunL() Write error: %d "), iError));
 return;
 PRINT((_L("e_cfilewriter_runl_outfile_write 1")));
 iError = iOutputFile->Write( *iFullBufferQueue[0]);
 PRINT((_L("e_cfilewriter_runl_outfile_write 0")));
 if ( iError == KErrNone )
 {
-UpdateOutputFileSize();
+iOutputFileSize += iFullBufferQueue[0]->Des().Length();
 iFullBufferQueue[0]->Des().Zero();
 iError = iEmptyBufferQueue.Append( iFullBufferQueue[0] );
 if ( iError )
 {
 PRINT((_L("CFileWriter::RunL() Append failed 3 %d"), iError));
 delete ( iFullBufferQueue[0] );
 iFullBufferQueue.Remove( 0 );
 return;
 }
 iFullBufferQueue.Remove( 0 );
-		PRINT((_L("CFileWriter::RunL() Softlimit : Buffer sync written, Status: Full:%d Empty:%d Filesize:%Ld"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
+		PRINT((_L("CFileWriter::RunL() Softlimit : Buffer sync written, Status: Full:%d Empty:%d Filesize:%d"), iFullBufferQueue.Count(), iEmptyBufferQueue.Count(), iOutputFileSize ));
 }
 else
 {
 PRINT((_L("CFileWriter::RunL() Write error: %d "), iError));
 return;

branch	RCL_3
changeset 49	735348f59235
parent 40	f429a0a2075b
child 50	948c7f65f6d4