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

CrystalHD: Simplfy extradata handling for non-Annex B content.

Browse Source 
Originally, we needed to restore the original extradata after
initialising the mp4toannexb filter because mplayer would end up
taking two passes through the init sequence for the same stream
and end up miscategorising the stream. This doesn't seem to happen
anymore, making the backup/restore process unnecessary.

Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Philip Langdale 2011-06-12 20:13:18 -07:00
parent 043d2affbb
commit edf5fbd5b2
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/crystalhd.c
View File

@ -402,34 +402,19 @@ static av_cold int init(AVCodecContext *avctx)
uint8_t *dummy_p; uint8_t *dummy_p;
int dummy_int; int dummy_int;
uint32_t orig_data_size = avctx->extradata_size; format.startCodeSz = (avctx->extradata[4] & 0x03) + 1;
uint8_t *orig_data = av_malloc(orig_data_size);
if (!orig_data) {
av_log(avctx, AV_LOG_ERROR,
"Failed to allocate copy of extradata\n");
return AVERROR(ENOMEM);
}
memcpy(orig_data, avctx->extradata, orig_data_size);
priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb"); priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb");
if (!priv->bsfc) { if (!priv->bsfc) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Cannot open the h264_mp4toannexb BSF!\n"); "Cannot open the h264_mp4toannexb BSF!\n");
av_free(orig_data);
return AVERROR_BSF_NOT_FOUND; return AVERROR_BSF_NOT_FOUND;
} }
av_bitstream_filter_filter(priv->bsfc, avctx, NULL, &dummy_p, av_bitstream_filter_filter(priv->bsfc, avctx, NULL, &dummy_p,
&dummy_int, NULL, 0, 0); &dummy_int, NULL, 0, 0);
priv->sps_pps_buf = avctx->extradata; format.pMetaData = avctx->extradata;
priv->sps_pps_size = avctx->extradata_size; format.metaDataSz = avctx->extradata_size;
avctx->extradata = orig_data;
avctx->extradata_size = orig_data_size;
format.pMetaData = priv->sps_pps_buf;
format.metaDataSz = priv->sps_pps_size;
format.startCodeSz = (avctx->extradata[4] & 0x03) + 1;
} }
break; break;
case BC_MSUBTYPE_H264: case BC_MSUBTYPE_H264: