Mostly whitespace

This commit is contained in:
Grigory Chudov
2013-04-07 21:57:11 -04:00
parent 9670c6c891
commit 8eca57d477

View File

@@ -31,7 +31,7 @@ using OpenCLNet;
namespace CUETools.Codecs.FLACCL namespace CUETools.Codecs.FLACCL
{ {
public class FLACCLWriterSettings: AudioEncoderSettings public class FLACCLWriterSettings : AudioEncoderSettings
{ {
public FLACCLWriterSettings() public FLACCLWriterSettings()
: base("", "8") : base("", "8")
@@ -273,6 +273,7 @@ namespace CUETools.Codecs.FLACCL
{ {
if (inited) if (inited)
{ {
inited = false;
int nFrames = samplesInBuffer / m_blockSize; int nFrames = samplesInBuffer / m_blockSize;
if (nFrames > 0) if (nFrames > 0)
do_output_frames(nFrames); do_output_frames(nFrames);
@@ -303,6 +304,14 @@ namespace CUETools.Codecs.FLACCL
task2.frameCount = 0; task2.frameCount = 0;
} }
task1.Dispose();
task2.Dispose();
if (cpu_tasks != null)
foreach (FLACCLTask task in cpu_tasks)
task.Dispose();
openCLProgram.Dispose();
OCLMan.Dispose();
if (_IO.CanSeek) if (_IO.CanSeek)
{ {
if (sample_count <= 0 && _position != 0) if (sample_count <= 0 && _position != 0)
@@ -330,13 +339,6 @@ namespace CUETools.Codecs.FLACCL
} }
_IO.Close(); _IO.Close();
task1.Dispose();
task2.Dispose();
if (cpu_tasks != null)
foreach (FLACCLTask task in cpu_tasks)
task.Dispose();
openCLProgram.Dispose();
OCLMan.Dispose();
inited = false; inited = false;
} }
} }
@@ -961,7 +963,7 @@ namespace CUETools.Codecs.FLACCL
{ {
FlacSubframeInfo sub = frame.subframes[ch]; FlacSubframeInfo sub = frame.subframes[ch];
// subframe header // subframe header
int type_code = (int) sub.best.type; int type_code = (int)sub.best.type;
if (sub.best.type == SubframeType.Fixed) if (sub.best.type == SubframeType.Fixed)
type_code |= sub.best.order; type_code |= sub.best.order;
if (sub.best.type == SubframeType.LPC) if (sub.best.type == SubframeType.LPC)
@@ -1061,7 +1063,7 @@ namespace CUETools.Codecs.FLACCL
{ {
for (int ch = 0; ch < channelsCount; ch++) for (int ch = 0; ch < channelsCount; ch++)
{ {
int *selectedTasks = (int*)task.clSelectedTasksPtr; int* selectedTasks = (int*)task.clSelectedTasksPtr;
for (int j = 0; j < task.nEstimateTasksPerChannel; j++) for (int j = 0; j < task.nEstimateTasksPerChannel; j++)
{ {
int k = j; int k = j;
@@ -1315,7 +1317,7 @@ namespace CUETools.Codecs.FLACCL
/// </summary> /// </summary>
/// <param name="task"></param> /// <param name="task"></param>
/// <param name="doMidside"></param> /// <param name="doMidside"></param>
unsafe void unpack_samples_16(FLACCLTask task, byte * srcptr, int count) unsafe void unpack_samples_16(FLACCLTask task, byte* srcptr, int count)
{ {
short* src = (short*)srcptr; short* src = (short*)srcptr;