diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fed72bb69b9968c1133032f86d5f3019df37a784..ba51ec1928f1ed1d58ced175990433a7696344d5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1267,6 +1267,15 @@ typedef struct AVFrame { */ int64_t channel_layout; + /** + * sample rate of the audio frame + * - encoding: unused + * - decoding: read by user. + * Code outside libavcodec should access this field using: + * av_opt_ptr(avcodec_get_frame_class(), frame, "sample_rate") + */ + int sample_rate; + } AVFrame; struct AVCodecInternal; diff --git a/libavcodec/options.c b/libavcodec/options.c index 173729cbc2bc88276603def8fd065e2c3b4e0f1b..3731b1f535de2d725a9e5bf5d07fc52cf84e4a7f 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -240,6 +240,7 @@ static const AVOption frame_options[]={ {"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, {"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.dbl = -1 }, 0, INT_MAX, 0}, {"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.dbl = 0 }, 0, INT64_MAX, 0}, +{"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, {NULL}, }; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 85c635138009a12cfd3bcf7e0b05cf9c297efb79..4b6ddeae1cb5fea571a5e024a2fcddfd6c5a6fb5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1547,6 +1547,8 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, frame->format = avctx->sample_fmt; if (!frame->channel_layout) frame->channel_layout = avctx->channel_layout; + if (!frame->sample_rate) + frame->sample_rate = avctx->sample_rate; } avctx->pkt = NULL;