RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

crystalhd: Revert back to letting hardware handle packed b-frames 

I'm not sure why, but the mpeg4_unpack_bframes bsf is not
interacting well with seeking. Looking at the code, it should be
ok, with possibly one warning shown, but I see it getting stuck
for an extended period of time after a seek where a packed frame
is cached to be shown later.

So, I gave up on that and went back to making the old hardware
based path work. Turns out that it wasn't broken except that some
samples have a 6 byte drop packet which I wasn't accounting for.

Now it works again and seeks are good.
This commit is contained in:
Philip Langdale 2016-10-15 15:50:29 -07:00
parent b5d714f493
commit 6cc390dd5a
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/crystalhd.c
View File

@ -140,6 +140,7 @@ typedef struct {
/* Options */ /* Options */
uint32_t sWidth; uint32_t sWidth;
uint8_t bframe_bug;
} CHDContext; } CHDContext;
static const AVOption options[] = { static const AVOption options[] = {
@ -460,14 +461,6 @@ static av_cold int init(AVCodecContext *avctx)
format.pMetaData = avctx->extradata; format.pMetaData = avctx->extradata;
format.metaDataSz = avctx->extradata_size; format.metaDataSz = avctx->extradata_size;
break; break;
case BC_MSUBTYPE_DIVX:
avret = init_bsf(avctx, "mpeg4_unpack_bframes");
if (avret != 0) {
return avret;
}
format.pMetaData = avctx->extradata;
format.metaDataSz = avctx->extradata_size;
break;
case BC_MSUBTYPE_H264: case BC_MSUBTYPE_H264:
format.startCodeSz = 4; format.startCodeSz = 4;
// Fall-through // Fall-through
@ -476,6 +469,7 @@ static av_cold int init(AVCodecContext *avctx)
case BC_MSUBTYPE_WMV3: case BC_MSUBTYPE_WMV3:
case BC_MSUBTYPE_WMVA: case BC_MSUBTYPE_WMVA:
case BC_MSUBTYPE_MPEG2VIDEO: case BC_MSUBTYPE_MPEG2VIDEO:
case BC_MSUBTYPE_DIVX:
case BC_MSUBTYPE_DIVX311: case BC_MSUBTYPE_DIVX311:
format.pMetaData = avctx->extradata; format.pMetaData = avctx->extradata;
format.metaDataSz = avctx->extradata_size; format.metaDataSz = avctx->extradata_size;
@ -829,6 +823,17 @@ static inline CopyRet receive_frame(AVCodecContext *avctx,
priv->last_picture = output.PicInfo.picture_number - 1; priv->last_picture = output.PicInfo.picture_number - 1;
} }
if (avctx->codec->id == AV_CODEC_ID_MPEG4 &&
output.PicInfo.timeStamp == 0 && priv->bframe_bug) {
if (!priv->bframe_bug) {
av_log(avctx, AV_LOG_VERBOSE,
"CrystalHD: Not returning packed frame twice.\n");
}
priv->last_picture++;
DtsReleaseOutputBuffs(dev, NULL, FALSE);
return RET_COPY_AGAIN;
}
print_frame_info(priv, &output); print_frame_info(priv, &output);
if (priv->last_picture + 1 < output.PicInfo.picture_number) { if (priv->last_picture + 1 < output.PicInfo.picture_number) {
@ -879,6 +884,22 @@ static int crystalhd_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt)
if (avpkt && avpkt->size) { if (avpkt && avpkt->size) {
int32_t tx_free = (int32_t)DtsTxFreeSize(dev); int32_t tx_free = (int32_t)DtsTxFreeSize(dev);
if (!priv->bframe_bug && (avpkt->size == 6 || avpkt->size == 7)) {
/*
* Drop frames trigger the bug
*/
av_log(avctx, AV_LOG_WARNING,
"CrystalHD: Enabling work-around for packed b-frame bug\n");
priv->bframe_bug = 1;
} else if (priv->bframe_bug && avpkt->size == 8) {
/*
* Delay frames don't trigger the bug
*/
av_log(avctx, AV_LOG_WARNING,
"CrystalHD: Disabling work-around for packed b-frame bug\n");
priv->bframe_bug = 0;
}
if (priv->bsfc) { if (priv->bsfc) {
AVPacket filter_packet = { 0 }; AVPacket filter_packet = { 0 };