RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-01 12:22:09 +00:00
Code Issues Projects Releases Wiki Activity

vaapi_mpeg4: Restore changes overwritten by merge

Browse Source 
From 2aa8e33d7d.
This commit is contained in:
Mark Thompson 2017-01-21 23:02:21 +00:00
parent 61164112a5
commit d40a1ae7ec
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vaapi_mpeg4.c
View File

@ -156,26 +156,15 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
VASliceParameterBufferMPEG4 slice_param; VASliceParameterBufferMPEG4 slice_param;
int err; int err;
/* video_plane_with_short_video_header() contains all GOBs
* in-order, and this is what VA API (Intel backend) expects: only
* a single slice param. So fake macroblock_number for Libav so
* that we don't call vaapi_mpeg4_decode_slice() again
*/
if (avctx->codec->id == AV_CODEC_ID_H263)
size = s->gb.buffer_end - buffer;
slice_param = (VASliceParameterBufferMPEG4) { slice_param = (VASliceParameterBufferMPEG4) {
.slice_data_size = size, .slice_data_size = size,
.slice_data_offset = 0, .slice_data_offset = 0,
.slice_data_flag = VA_SLICE_DATA_FLAG_ALL, .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
.macroblock_offset = get_bits_count(&s->gb) % 8, .macroblock_offset = get_bits_count(&s->gb) % 8,
.macroblock_number = s->mb_y * s->mb_width + s->mb_x, .macroblock_number = 0,
.quant_scale = s->qscale, .quant_scale = s->qscale,
}; };
if (avctx->codec->id == AV_CODEC_ID_H263)
s->mb_y = s->mb_height;
err = ff_vaapi_decode_make_slice_buffer(avctx, pic, err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
&slice_param, sizeof(slice_param), &slice_param, sizeof(slice_param),
buffer, size); buffer, size);