virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers

Browse Source 
Fixes a regression introduced by 0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.

(cherry picked from commit db0af7250a276700a349766c5412eb48ec630f0a)
This commit is contained in:
Matthieu Bouron 2016-06-28 12:25:27 +02:00
parent 25f0ea9ece
commit 8fd5669077
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/mediacodecdec_h264.c
View File

@ -112,8 +112,25 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
}
if (pps && sps) {
ff_AMediaFormat_setBuffer(format, "csd-0", (void*)sps->data, sps->data_size);
ff_AMediaFormat_setBuffer(format, "csd-1", (void*)pps->data, pps->data_size);
static const uint8_t nal_headers[] = { 0x00, 0x00, 0x00, 0x01 };
uint8_t *data = NULL;
size_t data_size = sizeof(nal_headers) + FFMAX(sps->data_size, pps->data_size);
data = av_mallocz(data_size);
if (!data) {
ret = AVERROR(ENOMEM);
goto done;
}
memcpy(data, nal_headers, sizeof(nal_headers));
memcpy(data + sizeof(nal_headers), sps->data, sps->data_size);
ff_AMediaFormat_setBuffer(format, "csd-0", (void*)data, sizeof(nal_headers) + sps->data_size);
memcpy(data + sizeof(nal_headers), pps->data, pps->data_size);
ff_AMediaFormat_setBuffer(format, "csd-1", (void*)data, sizeof(nal_headers) + pps->data_size);
av_freep(&data);
} else {
av_log(avctx, AV_LOG_ERROR, "Could not extract PPS/SPS from extradata");
ret = AVERROR_INVALIDDATA;