Data structure initialization functions

This commit is contained in:
Marko Viitanen 2012-06-04 11:53:48 +03:00
parent 8507aa0c9a
commit 5dcbe3e8df
5 changed files with 26 additions and 7 deletions

View file

@ -79,12 +79,16 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\bitstream.c" /> <ClCompile Include="..\..\src\bitstream.c" />
<ClCompile Include="..\..\src\cabac.c" />
<ClCompile Include="..\..\src\config.c" /> <ClCompile Include="..\..\src\config.c" />
<ClCompile Include="..\..\src\encmain.c" /> <ClCompile Include="..\..\src\encmain.c" />
<ClCompile Include="..\..\src\encoder.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\bitstream.h" /> <ClInclude Include="..\..\src\bitstream.h" />
<ClInclude Include="..\..\src\cabac.h" />
<ClInclude Include="..\..\src\config.h" /> <ClInclude Include="..\..\src\config.h" />
<ClInclude Include="..\..\src\encoder.h" />
<ClInclude Include="..\..\src\global.h" /> <ClInclude Include="..\..\src\global.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View file

@ -24,6 +24,12 @@
<ClCompile Include="..\..\src\bitstream.c"> <ClCompile Include="..\..\src\bitstream.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\encoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cabac.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\global.h"> <ClInclude Include="..\..\src\global.h">
@ -35,5 +41,11 @@
<ClInclude Include="..\..\src\bitstream.h"> <ClInclude Include="..\..\src\bitstream.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\encoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cabac.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

0
src/cabac.c Normal file
View file

0
src/cabac.h Normal file
View file

View file

@ -8,7 +8,7 @@
#ifndef _ENCODER_H #ifndef _ENCODER_H
#define _ENCODER_H #define _ENCODER_H
//ToDo: add ME data
typedef struct typedef struct
{ {
void (*IME)(encoder_control* encoder); void (*IME)(encoder_control* encoder);
@ -19,8 +19,10 @@ typedef struct
typedef struct typedef struct
{ {
FILE* file; FILE* file;
uint32_t width;
uint32_t height;
uint32_t height_in_LCU;
uint32_t width_in_LCU;
} encoder_input; } encoder_input;
typedef struct typedef struct
@ -30,6 +32,7 @@ typedef struct
FILE* output; FILE* output;
} encoder_control; } encoder_control;
init_encoder_control(encoder_control* control,FILE* output) {control->output = output;};
init_encoder_input(encoder_input* input,FILE* inputfile, uint32_t width, uint32_t height) {input->file = inputfile; input->width = width; input->height = height;};
#endif #endif