RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 14:39:30 +00:00
Code Issues Projects Releases Wiki Activity

lavc: add a sample_rate field to AVFrame.

Browse Source 
The field is filled with the codec context information.
This commit is contained in:
Nicolas George 2012-04-28 14:07:50 +02:00
parent 4b0521eca9
commit 128dda7016
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avcodec.h
View File

@ -1267,6 +1267,15 @@ typedef struct AVFrame {
*/ */
int64_t channel_layout; 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; } AVFrame;
struct AVCodecInternal; struct AVCodecInternal;

1
libavcodec/options.c
View File

@ -240,6 +240,7 @@ static const AVOption frame_options[]={
{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, {"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}, {"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}, {"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}, {NULL},
}; };

2
libavcodec/utils.c
View File

@ -1547,6 +1547,8 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
frame->format = avctx->sample_fmt; frame->format = avctx->sample_fmt;
if (!frame->channel_layout) if (!frame->channel_layout)
frame->channel_layout = avctx->channel_layout; frame->channel_layout = avctx->channel_layout;
if (!frame->sample_rate)
frame->sample_rate = avctx->sample_rate;
} }
avctx->pkt = NULL; avctx->pkt = NULL;