From cd6d9846b03cee8597de67b2b0d01a6ef2e98464 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 20 Aug 2014 17:16:28 -0700 Subject: [PATCH] Replacing NOT_IMPLMENTED with NULL. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We don’t need to introduce new macro for the null value. Change-Id: I59dbae25feeebb4e8359095801aecc8bb17d7764 --- vp8/vp8_cx_iface.c | 10 +++++----- vp8/vp8_dx_iface.c | 14 +++++++------- vp9/vp9_cx_iface.c | 14 +++++++------- vp9/vp9_dx_iface.c | 14 +++++++------- vpx/internal/vpx_codec_internal.h | 2 -- 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 0c522bd08..deeca9618 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -1347,10 +1347,10 @@ CODEC_INTERFACE(vpx_codec_vp8_cx) = vp8e_destroy, /* vpx_codec_destroy_fn_t destroy; */ vp8e_ctf_maps, /* vpx_codec_ctrl_fn_map_t *ctrl_maps; */ { - NOT_IMPLEMENTED, /* vpx_codec_peek_si_fn_t peek_si; */ - NOT_IMPLEMENTED, /* vpx_codec_get_si_fn_t get_si; */ - NOT_IMPLEMENTED, /* vpx_codec_decode_fn_t decode; */ - NOT_IMPLEMENTED, /* vpx_codec_frame_get_fn_t frame_get; */ + NULL, /* vpx_codec_peek_si_fn_t peek_si; */ + NULL, /* vpx_codec_get_si_fn_t get_si; */ + NULL, /* vpx_codec_decode_fn_t decode; */ + NULL, /* vpx_codec_frame_get_fn_t frame_get; */ }, { 1, /* 1 cfg map */ @@ -1358,7 +1358,7 @@ CODEC_INTERFACE(vpx_codec_vp8_cx) = vp8e_encode, /* vpx_codec_encode_fn_t encode; */ vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */ vp8e_set_config, - NOT_IMPLEMENTED, + NULL, vp8e_get_preview, vp8e_mr_alloc_mem, } /* encoder functions */ diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index c76ac145f..2995b7d3d 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -815,15 +815,15 @@ CODEC_INTERFACE(vpx_codec_vp8_dx) = vp8_get_si, /* vpx_codec_get_si_fn_t get_si; */ vp8_decode, /* vpx_codec_decode_fn_t decode; */ vp8_get_frame, /* vpx_codec_frame_get_fn_t frame_get; */ - NOT_IMPLEMENTED, + NULL, }, { /* encoder functions */ 0, - NOT_IMPLEMENTED, - NOT_IMPLEMENTED, - NOT_IMPLEMENTED, - NOT_IMPLEMENTED, - NOT_IMPLEMENTED, - NOT_IMPLEMENTED + NULL, + NULL, + NULL, + NULL, + NULL, + NULL } }; diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 08f68491d..836eb5d52 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1355,11 +1355,11 @@ CODEC_INTERFACE(vpx_codec_vp9_cx) = { encoder_destroy, // vpx_codec_destroy_fn_t encoder_ctrl_maps, // vpx_codec_ctrl_fn_map_t { // NOLINT - NOT_IMPLEMENTED, // vpx_codec_peek_si_fn_t - NOT_IMPLEMENTED, // vpx_codec_get_si_fn_t - NOT_IMPLEMENTED, // vpx_codec_decode_fn_t - NOT_IMPLEMENTED, // vpx_codec_frame_get_fn_t - NOT_IMPLEMENTED // vpx_codec_set_fb_fn_t + NULL, // vpx_codec_peek_si_fn_t + NULL, // vpx_codec_get_si_fn_t + NULL, // vpx_codec_decode_fn_t + NULL, // vpx_codec_frame_get_fn_t + NULL // vpx_codec_set_fb_fn_t }, { // NOLINT 1, // 1 cfg map @@ -1367,8 +1367,8 @@ CODEC_INTERFACE(vpx_codec_vp9_cx) = { encoder_encode, // vpx_codec_encode_fn_t encoder_get_cxdata, // vpx_codec_get_cx_data_fn_t encoder_set_config, // vpx_codec_enc_config_set_fn_t - NOT_IMPLEMENTED, // vpx_codec_get_global_headers_fn_t + NULL, // vpx_codec_get_global_headers_fn_t encoder_get_preview, // vpx_codec_get_preview_frame_fn_t - NOT_IMPLEMENTED // vpx_codec_enc_mr_get_mem_loc_fn_t + NULL // vpx_codec_enc_mr_get_mem_loc_fn_t } }; diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index ee8290512..34ef88030 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -648,12 +648,12 @@ CODEC_INTERFACE(vpx_codec_vp9_dx) = { }, { // NOLINT 0, - NOT_IMPLEMENTED, // vpx_codec_enc_cfg_map_t - NOT_IMPLEMENTED, // vpx_codec_encode_fn_t - NOT_IMPLEMENTED, // vpx_codec_get_cx_data_fn_t - NOT_IMPLEMENTED, // vpx_codec_enc_config_set_fn_t - NOT_IMPLEMENTED, // vpx_codec_get_global_headers_fn_t - NOT_IMPLEMENTED, // vpx_codec_get_preview_frame_fn_t - NOT_IMPLEMENTED // vpx_codec_enc_mr_get_mem_loc_fn_t + NULL, // vpx_codec_enc_cfg_map_t + NULL, // vpx_codec_encode_fn_t + NULL, // vpx_codec_get_cx_data_fn_t + NULL, // vpx_codec_enc_config_set_fn_t + NULL, // vpx_codec_get_global_headers_fn_t + NULL, // vpx_codec_get_preview_frame_fn_t + NULL // vpx_codec_enc_mr_get_mem_loc_fn_t } }; diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h index 0f5ce3d68..e100ddc9d 100644 --- a/vpx/internal/vpx_codec_internal.h +++ b/vpx/internal/vpx_codec_internal.h @@ -286,8 +286,6 @@ typedef const struct vpx_codec_enc_cfg_map { vpx_codec_enc_cfg_t cfg; } vpx_codec_enc_cfg_map_t; -#define NOT_IMPLEMENTED 0 - /*!\brief Decoder algorithm interface interface * * All decoders \ref MUST expose a variable of this type. -- 2.40.0