Compilation with --disable-everything --enable-shared failed on systems with VAAPI support with the following undefined symbol in libavcodec/vaapi.o: libavcodec/libavcodec.so: undefined reference to `ff_mpeg_draw_horiz_band'tags/n2.1
| @@ -622,12 +622,12 @@ OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o | |||||
| OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o | OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o | ||||
| OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o | OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o | ||||
| OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o | OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o | ||||
| OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o | |||||
| OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o vaapi_mpeg.o | |||||
| OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o | OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o | ||||
| OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o | |||||
| OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o vaapi_mpeg.o | |||||
| OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o | OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o | ||||
| OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o | OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o | ||||
| OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o | |||||
| OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o vaapi_mpeg.o | |||||
| OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o | OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o | ||||
| # libavformat dependencies | # libavformat dependencies | ||||
| @@ -197,26 +197,4 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx) | |||||
| vactx->slice_params_alloc = 0; | vactx->slice_params_alloc = 0; | ||||
| } | } | ||||
| int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) | |||||
| { | |||||
| struct vaapi_context * const vactx = avctx->hwaccel_context; | |||||
| MpegEncContext *s = avctx->priv_data; | |||||
| int ret; | |||||
| ret = ff_vaapi_commit_slices(vactx); | |||||
| if (ret < 0) | |||||
| goto finish; | |||||
| ret = ff_vaapi_render_picture(vactx, | |||||
| ff_vaapi_get_surface_id(s->current_picture_ptr)); | |||||
| if (ret < 0) | |||||
| goto finish; | |||||
| ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); | |||||
| finish: | |||||
| ff_vaapi_common_end_frame(avctx); | |||||
| return ret; | |||||
| } | |||||
| /* @} */ | /* @} */ | ||||
| @@ -0,0 +1,48 @@ | |||||
| /* | |||||
| * Video Acceleration API (video decoding) | |||||
| * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1 | |||||
| * | |||||
| * Copyright (C) 2013 Anton Khirnov | |||||
| * | |||||
| * This file is part of FFmpeg. | |||||
| * | |||||
| * FFmpeg is free software; you can redistribute it and/or | |||||
| * modify it under the terms of the GNU Lesser General Public | |||||
| * License as published by the Free Software Foundation; either | |||||
| * version 2.1 of the License, or (at your option) any later version. | |||||
| * | |||||
| * FFmpeg is distributed in the hope that it will be useful, | |||||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||||
| * Lesser General Public License for more details. | |||||
| * | |||||
| * You should have received a copy of the GNU Lesser General Public | |||||
| * License along with FFmpeg; if not, write to the Free Software | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |||||
| */ | |||||
| #include "avcodec.h" | |||||
| #include "vaapi_internal.h" | |||||
| int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) | |||||
| { | |||||
| struct vaapi_context * const vactx = avctx->hwaccel_context; | |||||
| MpegEncContext *s = avctx->priv_data; | |||||
| int ret; | |||||
| ret = ff_vaapi_commit_slices(vactx); | |||||
| if (ret < 0) | |||||
| goto finish; | |||||
| ret = ff_vaapi_render_picture(vactx, | |||||
| ff_vaapi_get_surface_id(s->current_picture_ptr)); | |||||
| if (ret < 0) | |||||
| goto finish; | |||||
| ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); | |||||
| finish: | |||||
| ff_vaapi_common_end_frame(avctx); | |||||
| return ret; | |||||
| } | |||||