mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 03:46:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

libav: Switch to non-deprecated symbols

Browse source 
This symbols/enums will all be deprecated in the next releases
This commit is contained in:
Edward Hervey 2012-09-12 15:30:05 +02:00
parent 70471f230f
commit 0f9cc8dac6
5 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/libav/gstavcodecmap.c
View file

@ -1865,23 +1865,23 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
*/ */
static GstCaps * 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) AVCodecContext * context, enum CodecID codec_id)
{ {
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstAudioFormat format; GstAudioFormat format;
switch (sample_fmt) { switch (sample_fmt) {
case SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16:
format = GST_AUDIO_FORMAT_S16; format = GST_AUDIO_FORMAT_S16;
break; break;
case SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
format = GST_AUDIO_FORMAT_S32; format = GST_AUDIO_FORMAT_S32;
break; break;
case SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLT:
format = GST_AUDIO_FORMAT_F32; format = GST_AUDIO_FORMAT_F32;
break; break;
case SAMPLE_FMT_DBL: case AV_SAMPLE_FMT_DBL:
format = GST_AUDIO_FORMAT_F64; format = GST_AUDIO_FORMAT_F64;
break; break;
default: default:
@ -1930,12 +1930,12 @@ gst_ffmpeg_codectype_to_audio_caps (AVCodecContext * context,
} }
} else { } else {
GstCaps *temp; GstCaps *temp;
enum SampleFormat i; enum AVSampleFormat i;
AVCodecContext ctx = { 0, }; AVCodecContext ctx = { 0, };
ctx.channels = -1; ctx.channels = -1;
caps = gst_caps_new_empty (); 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); temp = gst_ffmpeg_smpfmt_to_caps (i, encode ? &ctx : NULL, codec_id);
if (temp != NULL) { if (temp != NULL) {
gst_caps_append (caps, temp); gst_caps_append (caps, temp);
@ -2038,16 +2038,16 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
switch (format) { switch (format) {
case GST_AUDIO_FORMAT_F32: case GST_AUDIO_FORMAT_F32:
context->sample_fmt = SAMPLE_FMT_FLT; context->sample_fmt = AV_SAMPLE_FMT_FLT;
break; break;
case GST_AUDIO_FORMAT_F64: case GST_AUDIO_FORMAT_F64:
context->sample_fmt = SAMPLE_FMT_DBL; context->sample_fmt = AV_SAMPLE_FMT_DBL;
break; break;
case GST_AUDIO_FORMAT_S32: case GST_AUDIO_FORMAT_S32:
context->sample_fmt = SAMPLE_FMT_S32; context->sample_fmt = AV_SAMPLE_FMT_S32;
break; break;
case GST_AUDIO_FORMAT_S16: case GST_AUDIO_FORMAT_S16:
context->sample_fmt = SAMPLE_FMT_S16; context->sample_fmt = AV_SAMPLE_FMT_S16;
break; break;
default: default:
break; break;

12
ext/libav/gstavutils.c
View file

@ -39,21 +39,21 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
} }
gint gint
av_smp_format_depth (enum SampleFormat smp_fmt) av_smp_format_depth (enum AVSampleFormat smp_fmt)
{ {
gint depth = -1; gint depth = -1;
switch (smp_fmt) { switch (smp_fmt) {
case SAMPLE_FMT_U8: case AV_SAMPLE_FMT_U8:
depth = 1; depth = 1;
break; break;
case SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16:
depth = 2; depth = 2;
break; break;
case SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
case SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLT:
depth = 4; depth = 4;
break; break;
case SAMPLE_FMT_DBL: case AV_SAMPLE_FMT_DBL:
depth = 8; depth = 8;
break; break;
default: default:

2
ext/libav/gstavutils.h
View file

@ -89,7 +89,7 @@ G_CONST_RETURN gchar *
gst_ffmpeg_get_codecid_longname (enum CodecID codec_id); gst_ffmpeg_get_codecid_longname (enum CodecID codec_id);
gint gint
av_smp_format_depth(enum SampleFormat smp_fmt); av_smp_format_depth(enum AVSampleFormat smp_fmt);
GstBuffer * GstBuffer *
new_aligned_buffer (gint size); new_aligned_buffer (gint size);

1
ext/libav/gstavviddec.c
View file

@ -606,7 +606,6 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
/* tell ffmpeg we own this buffer, tranfer the ref we have on the buffer to /* tell ffmpeg we own this buffer, tranfer the ref we have on the buffer to
* the opaque data. */ * the opaque data. */
picture->type = FF_BUFFER_TYPE_USER; picture->type = FF_BUFFER_TYPE_USER;
picture->age = 256 * 256 * 256 * 64;
GST_LOG_OBJECT (ffmpegdec, "returned frame %p", frame->output_buffer); GST_LOG_OBJECT (ffmpegdec, "returned frame %p", frame->output_buffer);

2
ext/libav/gstavvidenc.c
View file

@ -662,7 +662,7 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
GstVideoFrame vframe; GstVideoFrame vframe;
if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) 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)) { if (!gst_video_frame_map (&vframe, info, frame->input_buffer, GST_MAP_READ)) {
GST_ERROR_OBJECT (encoder, "Failed to map input buffer"); GST_ERROR_OBJECT (encoder, "Failed to map input buffer");