*/
static GstCaps *
-gst_ffmpeg_smpfmt_to_caps (enum SampleFormat sample_fmt,
+gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt,
AVCodecContext * context, enum CodecID codec_id)
{
GstCaps *caps = NULL;
GstAudioFormat format;
switch (sample_fmt) {
- case SAMPLE_FMT_S16:
+ case AV_SAMPLE_FMT_S16:
format = GST_AUDIO_FORMAT_S16;
break;
- case SAMPLE_FMT_S32:
+ case AV_SAMPLE_FMT_S32:
format = GST_AUDIO_FORMAT_S32;
break;
- case SAMPLE_FMT_FLT:
+ case AV_SAMPLE_FMT_FLT:
format = GST_AUDIO_FORMAT_F32;
break;
- case SAMPLE_FMT_DBL:
+ case AV_SAMPLE_FMT_DBL:
format = GST_AUDIO_FORMAT_F64;
break;
default:
}
} else {
GstCaps *temp;
- enum SampleFormat i;
+ enum AVSampleFormat i;
AVCodecContext ctx = { 0, };
ctx.channels = -1;
caps = gst_caps_new_empty ();
- for (i = 0; i <= SAMPLE_FMT_DBL; i++) {
+ for (i = 0; i <= AV_SAMPLE_FMT_DBL; i++) {
temp = gst_ffmpeg_smpfmt_to_caps (i, encode ? &ctx : NULL, codec_id);
if (temp != NULL) {
gst_caps_append (caps, temp);
switch (format) {
case GST_AUDIO_FORMAT_F32:
- context->sample_fmt = SAMPLE_FMT_FLT;
+ context->sample_fmt = AV_SAMPLE_FMT_FLT;
break;
case GST_AUDIO_FORMAT_F64:
- context->sample_fmt = SAMPLE_FMT_DBL;
+ context->sample_fmt = AV_SAMPLE_FMT_DBL;
break;
case GST_AUDIO_FORMAT_S32:
- context->sample_fmt = SAMPLE_FMT_S32;
+ context->sample_fmt = AV_SAMPLE_FMT_S32;
break;
case GST_AUDIO_FORMAT_S16:
- context->sample_fmt = SAMPLE_FMT_S16;
+ context->sample_fmt = AV_SAMPLE_FMT_S16;
break;
default:
break;
}
gint
-av_smp_format_depth (enum SampleFormat smp_fmt)
+av_smp_format_depth (enum AVSampleFormat smp_fmt)
{
gint depth = -1;
switch (smp_fmt) {
- case SAMPLE_FMT_U8:
+ case AV_SAMPLE_FMT_U8:
depth = 1;
break;
- case SAMPLE_FMT_S16:
+ case AV_SAMPLE_FMT_S16:
depth = 2;
break;
- case SAMPLE_FMT_S32:
- case SAMPLE_FMT_FLT:
+ case AV_SAMPLE_FMT_S32:
+ case AV_SAMPLE_FMT_FLT:
depth = 4;
break;
- case SAMPLE_FMT_DBL:
+ case AV_SAMPLE_FMT_DBL:
depth = 8;
break;
default:
GstVideoFrame vframe;
if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame))
- ffmpegenc->picture->pict_type = FF_I_TYPE;
+ ffmpegenc->picture->pict_type = AV_PICTURE_TYPE_I;
if (!gst_video_frame_map (&vframe, info, frame->input_buffer, GST_MAP_READ)) {
GST_ERROR_OBJECT (encoder, "Failed to map input buffer");