--- libavcodec/libopencore-amr.c | 26 +++++++++++++------------- libavcodec/libvo-amrwbenc.c | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 8cee785..a5c9269 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -50,7 +50,7 @@ typedef struct AMR_bitrates { } AMR_bitrates; /* Match desired bitrate */ -static int getBitrateMode(int bitrate) +static int get_bitrate_mode(int bitrate) { /* make the correspondance between bitrate and mode */ static const AMR_bitrates rates[] = {{ 4750, MR475}, @@ -71,8 +71,8 @@ static int getBitrateMode(int bitrate) } typedef struct AMRContext { - void *decState; - void *enstate; + void *dec_state; + void *enc_state; int enc_bitrate; } AMRContext; @@ -80,8 +80,8 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; - s->decState = Decoder_Interface_init(); - if (!s->decState) { + s->dec_state = Decoder_Interface_init(); + if (!s->dec_state) { av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n"); return -1; } @@ -100,7 +100,7 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; - Decoder_Interface_exit(s->decState); + Decoder_Interface_exit(s->dec_state); return 0; } @@ -124,7 +124,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, } /* call decoder */ - Decoder_Interface_Decode(s->decState, buf, data, 0); + Decoder_Interface_Decode(s->dec_state, buf, data, 0); *data_size = 160 * 2; return packet_size; @@ -159,13 +159,13 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) avctx->frame_size = 160; avctx->coded_frame = avcodec_alloc_frame(); - s->enstate=Encoder_Interface_init(0); - if (!s->enstate) { + s->enc_state = Encoder_Interface_init(0); + if (!s->enc_state) { av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n"); return -1; } - if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) { + if ((s->enc_bitrate = get_bitrate_mode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported); return AVERROR(ENOSYS); } @@ -177,7 +177,7 @@ static av_cold int amr_nb_encode_close(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; - Encoder_Interface_exit(s->enstate); + Encoder_Interface_exit(s->enc_state); av_freep(&avctx->coded_frame); return 0; } @@ -189,12 +189,12 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AMRContext *s = avctx->priv_data; int written; - if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) { + if ((s->enc_bitrate = get_bitrate_mode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported); return AVERROR(ENOSYS); } - written = Encoder_Interface_Encode(s->enstate, s->enc_bitrate, data, + written = Encoder_Interface_Encode(s->enc_state, s->enc_bitrate, data, frame, 0); return written; diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index a5e8f39..cfd1bac 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -38,7 +38,7 @@ typedef struct AMRWBContext { int allow_dtx; } AMRWBContext; -static int getWBBitrateMode(int bitrate) +static int get_wb_bitrate_mode(int bitrate) { /* make the correspondance between bitrate and mode */ AMRWB_bitrates rates[] = { { 6600, 0}, @@ -73,7 +73,7 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx) return AVERROR(ENOSYS); } - if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { + if ((s->mode = get_wb_bitrate_mode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); return AVERROR(ENOSYS); } @@ -103,7 +103,7 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, AMRWBContext *s = avctx->priv_data; int size; - if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { + if ((s->mode = get_wb_bitrate_mode(avctx->bit_rate)) < 0) { av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); return AVERROR(ENOSYS); } -- 1.7.3.1 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel