aom/{aom_encoder,aomcx}.h: rm leftover SVC refs
the bulk was deleted in:
0a9b36b
Remove unused APIs and skin_detection dead code
Change-Id: I534360ca3d3b379e083b3c79c15eebf0e622fed2
This commit is contained in:
Родитель
f975ac57b0
Коммит
23dcada96f
|
@ -155,16 +155,10 @@ typedef uint32_t aom_codec_er_flags_t;
|
||||||
* extend this list to provide additional functionality.
|
* extend this list to provide additional functionality.
|
||||||
*/
|
*/
|
||||||
enum aom_codec_cx_pkt_kind {
|
enum aom_codec_cx_pkt_kind {
|
||||||
AOM_CODEC_CX_FRAME_PKT, /**< Compressed video frame */
|
AOM_CODEC_CX_FRAME_PKT, /**< Compressed video frame */
|
||||||
AOM_CODEC_STATS_PKT, /**< Two-pass statistics for this frame */
|
AOM_CODEC_STATS_PKT, /**< Two-pass statistics for this frame */
|
||||||
AOM_CODEC_FPMB_STATS_PKT, /**< first pass mb statistics for this frame */
|
AOM_CODEC_FPMB_STATS_PKT, /**< first pass mb statistics for this frame */
|
||||||
AOM_CODEC_PSNR_PKT, /**< PSNR statistics for this frame */
|
AOM_CODEC_PSNR_PKT, /**< PSNR statistics for this frame */
|
||||||
// Spatial SVC is still experimental and may be removed before the next ABI
|
|
||||||
// bump.
|
|
||||||
#if AOM_ENCODER_ABI_VERSION > (5 + AOM_CODEC_ABI_VERSION)
|
|
||||||
AOM_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/
|
|
||||||
AOM_CODEC_SPATIAL_SVC_LAYER_PSNR, /**< PSNR for each layer in this frame*/
|
|
||||||
#endif
|
|
||||||
AOM_CODEC_CUSTOM_PKT = 256 /**< Algorithm extensions */
|
AOM_CODEC_CUSTOM_PKT = 256 /**< Algorithm extensions */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -199,12 +193,6 @@ typedef struct aom_codec_cx_pkt {
|
||||||
double psnr[4]; /**< PSNR, total/y/u/v */
|
double psnr[4]; /**< PSNR, total/y/u/v */
|
||||||
} psnr; /**< data for PSNR packet */
|
} psnr; /**< data for PSNR packet */
|
||||||
aom_fixed_buf_t raw; /**< data for arbitrary packets */
|
aom_fixed_buf_t raw; /**< data for arbitrary packets */
|
||||||
// Spatial SVC is still experimental and may be removed before the next
|
|
||||||
// ABI bump.
|
|
||||||
#if AOM_ENCODER_ABI_VERSION > (5 + AOM_CODEC_ABI_VERSION)
|
|
||||||
size_t layer_sizes[AOM_SS_MAX_LAYERS];
|
|
||||||
struct aom_psnr_pkt layer_psnr[AOM_SS_MAX_LAYERS];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This packet size is fixed to allow codecs to extend this
|
/* This packet size is fixed to allow codecs to extend this
|
||||||
* interface without having to manage storage for raw packets,
|
* interface without having to manage storage for raw packets,
|
||||||
|
|
31
aom/aomcx.h
31
aom/aomcx.h
|
@ -572,33 +572,6 @@ typedef enum aom_scaling_mode_1d {
|
||||||
AOME_ONETWO = 3
|
AOME_ONETWO = 3
|
||||||
} AOM_SCALING_MODE;
|
} AOM_SCALING_MODE;
|
||||||
|
|
||||||
/*!\brief Temporal layering mode enum for AV1 SVC.
|
|
||||||
*
|
|
||||||
* This set of macros define the different temporal layering modes.
|
|
||||||
* Supported codecs: AV1 (in SVC mode)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
typedef enum av1e_temporal_layering_mode {
|
|
||||||
/*!\brief No temporal layering.
|
|
||||||
* Used when only spatial layering is used.
|
|
||||||
*/
|
|
||||||
AV1E_TEMPORAL_LAYERING_MODE_NOLAYERING = 0,
|
|
||||||
|
|
||||||
/*!\brief Bypass mode.
|
|
||||||
* Used when application needs to control temporal layering.
|
|
||||||
* This will only work when the number of spatial layers equals 1.
|
|
||||||
*/
|
|
||||||
AV1E_TEMPORAL_LAYERING_MODE_BYPASS = 1,
|
|
||||||
|
|
||||||
/*!\brief 0-1-0-1... temporal layering scheme with two temporal layers.
|
|
||||||
*/
|
|
||||||
AV1E_TEMPORAL_LAYERING_MODE_0101 = 2,
|
|
||||||
|
|
||||||
/*!\brief 0-2-1-2... temporal layering scheme with three temporal layers.
|
|
||||||
*/
|
|
||||||
AV1E_TEMPORAL_LAYERING_MODE_0212 = 3
|
|
||||||
} AV1E_TEMPORAL_LAYERING_MODE;
|
|
||||||
|
|
||||||
/*!\brief aom region of interest map
|
/*!\brief aom region of interest map
|
||||||
*
|
*
|
||||||
* These defines the data structures for the region of interest map
|
* These defines the data structures for the region of interest map
|
||||||
|
@ -690,10 +663,6 @@ AOM_CTRL_USE_TYPE(AOME_SET_ACTIVEMAP, aom_active_map_t *)
|
||||||
AOM_CTRL_USE_TYPE(AOME_SET_SCALEMODE, aom_scaling_mode_t *)
|
AOM_CTRL_USE_TYPE(AOME_SET_SCALEMODE, aom_scaling_mode_t *)
|
||||||
#define AOM_CTRL_AOME_SET_SCALEMODE
|
#define AOM_CTRL_AOME_SET_SCALEMODE
|
||||||
|
|
||||||
AOM_CTRL_USE_TYPE(AV1E_SET_SVC, int)
|
|
||||||
#define AOM_CTRL_AV1E_SET_SVC
|
|
||||||
AOM_CTRL_USE_TYPE(AV1E_SET_SVC_PARAMETERS, void *)
|
|
||||||
#define AOM_CTRL_AV1E_SET_SVC_PARAMETERS
|
|
||||||
AOM_CTRL_USE_TYPE(AV1E_REGISTER_CX_CALLBACK, void *)
|
AOM_CTRL_USE_TYPE(AV1E_REGISTER_CX_CALLBACK, void *)
|
||||||
#define AOM_CTRL_AV1E_REGISTER_CX_CALLBACK
|
#define AOM_CTRL_AV1E_REGISTER_CX_CALLBACK
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче