mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 19:42:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: Use AVFrame API instead of deprecated AVPicture API

Browse source
This commit is contained in:
Sebastian Dröge 2016-01-20 10:31:40 +02:00
parent 4e0b05bf7f
commit 6e18a221a0
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/libav/gstavviddec.c
View file

@ -1179,7 +1179,7 @@ static GstFlowReturn
get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame) get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
{ {
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
AVPicture pic, *outpic; AVFrame pic, *outpic;
GstVideoFrame vframe; GstVideoFrame vframe;
GstVideoInfo *info; GstVideoInfo *info;
gint c; gint c;
@ -1203,6 +1203,10 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
GST_MAP_READ | GST_MAP_WRITE)) GST_MAP_READ | GST_MAP_WRITE))
goto map_failed; goto map_failed;
memset (&pic, 0, sizeof (pic));
pic.format = ffmpegdec->pic_pix_fmt;
pic.width = GST_VIDEO_FRAME_WIDTH (&vframe);
pic.height = GST_VIDEO_FRAME_HEIGHT (&vframe);
for (c = 0; c < AV_NUM_DATA_POINTERS; c++) { for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
if (c < GST_VIDEO_INFO_N_PLANES (info)) { if (c < GST_VIDEO_INFO_N_PLANES (info)) {
pic.data[c] = GST_VIDEO_FRAME_PLANE_DATA (&vframe, c); pic.data[c] = GST_VIDEO_FRAME_PLANE_DATA (&vframe, c);
@ -1215,10 +1219,12 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
} }
} }
outpic = (AVPicture *) ffmpegdec->picture; outpic = ffmpegdec->picture;
av_picture_copy (&pic, outpic, ffmpegdec->context->pix_fmt, if (av_frame_copy (&pic, outpic) != 0) {
GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info)); GST_ERROR_OBJECT (ffmpegdec, "Failed to copy output frame");
ret = GST_FLOW_ERROR;
}
gst_video_frame_unmap (&vframe); gst_video_frame_unmap (&vframe);