The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2024-12-05 03:24:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

h264: Move the enums out of enum.h

Browse Source
This commit is contained in:
rw-r-r-0644 2020-05-21 15:07:04 +02:00 committed by James
parent 03ce7b3501
commit a6c336a706
4 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/h264/decode.h
View File

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "enum.h"
#include "stream.h" #include "stream.h"
/** /**
@ -12,6 +11,24 @@
extern "C" { extern "C" {
#endif #endif
//! h264 decoder parameters for H264DECSetParam.
typedef enum H264Parameter
{
//! Set the callback which is called when a frame is output from the decoder.
H264_PARAMETER_FRAME_POINTER_OUTPUT = 1,
//! Set whether the decoder should internally buffer frames or call the callback
//! immediately as soon as a frame is emitted.
H264_PARAMETER_OUTPUT_PER_FRAME = 0x20000002,
H264_PARAMETER_UNKNOWN_20000010 = 0x20000010,
H264_PARAMETER_UNKNOWN_20000030 = 0x20000030,
H264_PARAMETER_UNKNOWN_20000040 = 0x20000040,
//! Set a user memory pointer which is passed to the frame output callback.
H264_PARAMETER_USER_MEMORY = 0x70000001,
} H264Parameter;
/** /**
* Calculate the amount of memory required for the specified parameters. * Calculate the amount of memory required for the specified parameters.

56
include/h264/enum.h
View File

@ -1,56 +0,0 @@
#pragma once
#include <wut.h>
/**
* \defgroup h264_enum Enums
* \ingroup h264
* @{
*/
#ifdef __cplusplus
extern "C" {
#endif
//! h264 library errors.
typedef enum H264Error
{
//! No errors.
H264_ERROR_OK = 0,
//! Invalid picture parameter set.
H264_ERROR_INVALID_PPS = 24,
//! Invalid sequence parameter set.
H264_ERROR_INVALID_SPS = 26,
//! Invalid slice header.
H264_ERROR_INVALID_SLICEHEADER = 61,
//! Generic h264 error.
H264_ERROR_GENERIC = 0x1000000,
//! Invalid parameters passed.
H264_ERROR_INVALID_PARAMETER = 0x1010000,
//! The amount of memory provided to the h264 library
//! is insufficient.
H264_ERROR_OUT_OF_MEMORY = 0x1020000,
//! Invalid h264 stream profile. Only the baseline (66),
//! main (77) and high (100) profiles are allowed.
H264_ERROR_INVALID_PROFILE = 0x1080000,
} H264Error;
//! h264 decoder parameters for H264DECSetParam.
typedef enum H264Parameter
{
//! Set the callback which is called when a frame is output from the decoder.
H264_PARAMETER_FRAME_POINTER_OUTPUT = 1,
//! Set whether the decoder should internally buffer frames or call the callback
//! immediately as soon as a frame is emitted.
H264_PARAMETER_OUTPUT_PER_FRAME = 0x20000002,
H264_PARAMETER_UNKNOWN_20000010 = 0x20000010,
H264_PARAMETER_UNKNOWN_20000030 = 0x20000030,
H264_PARAMETER_UNKNOWN_20000040 = 0x20000040,
//! Set a user memory pointer which is passed to the frame output callback.
H264_PARAMETER_USER_MEMORY = 0x70000001,
} H264Parameter;
#ifdef __cplusplus
}
#endif
/** @} */

31
include/h264/stream.h
View File

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "enum.h"
/** /**
* \defgroup h264_stream H264 Stream * \defgroup h264_stream H264 Stream
@ -17,6 +16,36 @@ typedef struct H264DecodeOutput H264DecodeOutput;
typedef void (*H264DECFptrOutputFn)(H264DecodeOutput *output); typedef void (*H264DECFptrOutputFn)(H264DecodeOutput *output);
//! h264 library errors.
typedef enum H264Error
{
//! No errors.
H264_ERROR_OK = 0,
//! Invalid picture parameter set.
H264_ERROR_INVALID_PPS = 24,
//! Invalid sequence parameter set.
H264_ERROR_INVALID_SPS = 26,
//! Invalid slice header.
H264_ERROR_INVALID_SLICEHEADER = 61,
//! Generic h264 error.
H264_ERROR_GENERIC = 0x1000000,
//! Invalid parameters passed.
H264_ERROR_INVALID_PARAMETER = 0x1010000,
//! The amount of memory provided to the h264 library
//! is insufficient.
H264_ERROR_OUT_OF_MEMORY = 0x1020000,
//! Invalid h264 stream profile. Only the baseline (66),
//! main (77) and high (100) profiles are allowed.
H264_ERROR_INVALID_PROFILE = 0x1080000,
} H264Error;
struct WUT_PACKED H264DecodedVuiParameters struct WUT_PACKED H264DecodedVuiParameters
{ {
uint8_t aspect_ratio_info_present_flag; uint8_t aspect_ratio_info_present_flag;

1
tests/test_compile_headers_common/test_compile_headers_list.h
View File

@ -72,7 +72,6 @@
#include <gx2r/mem.h> #include <gx2r/mem.h>
#include <gx2r/resource.h> #include <gx2r/resource.h>
#include <gx2r/surface.h> #include <gx2r/surface.h>
#include <h264/enum.h>
#include <h264/stream.h> #include <h264/stream.h>
#include <h264/decode.h> #include <h264/decode.h>
#include <nn/ac/ac_c.h> #include <nn/ac/ac_c.h>