har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hevc: Support extradata changes from multiple stsd

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2016-11-02 12:03:18 -04:00
parent 2fe30b4743
commit 47a795727f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/hevcdec.c
View File

@ -2774,6 +2774,8 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
AVPacket *avpkt) AVPacket *avpkt)
{ {
int ret; int ret;
int new_extradata_size;
uint8_t *new_extradata;
HEVCContext *s = avctx->priv_data; HEVCContext *s = avctx->priv_data;
if (!avpkt->size) { if (!avpkt->size) {
@ -2785,6 +2787,14 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
return 0; return 0;
} }
new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,
&new_extradata_size);
if (new_extradata && new_extradata_size > 0) {
ret = hevc_decode_extradata(s, new_extradata, new_extradata_size);
if (ret < 0)
return ret;
}
s->ref = NULL; s->ref = NULL;
ret = decode_nal_units(s, avpkt->data, avpkt->size); ret = decode_nal_units(s, avpkt->data, avpkt->size);
if (ret < 0) if (ret < 0)

4
libavformat/mov.c
View File

@ -1780,13 +1780,11 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
int video_codec_id = ff_codec_get_id(ff_codec_movvideo_tags, format); int video_codec_id = ff_codec_get_id(ff_codec_movvideo_tags, format);
if (codec_tag && if (codec_tag &&
(codec_tag == AV_RL32("hvc1") ||
codec_tag == AV_RL32("hev1") ||
(codec_tag != format && (codec_tag != format &&
// prores is allowed to have differing data format and codec tag // prores is allowed to have differing data format and codec tag
codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") && codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
(c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
: codec_tag != MKTAG('j','p','e','g'))))) { : codec_tag != MKTAG('j','p','e','g')))) {
/* Multiple fourcc, we skip JPEG. This is not correct, we should /* Multiple fourcc, we skip JPEG. This is not correct, we should
* export it as a separate AVStream but this needs a few changes * export it as a separate AVStream but this needs a few changes
* in the MOV demuxer, patch welcome. */ * in the MOV demuxer, patch welcome. */