generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "CrystalHD: Refine heuristic logic."

Browse Source 
This reverts commit f968ef922d.
This commit is contained in:
Philip Langdale
2011-03-26 16:04:36 -07:00
parent f968ef922d
commit 3188d33a11
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
libavcodec/crystalhd.c
View File

@@ -512,7 +512,8 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
{ {
BC_STATUS ret; BC_STATUS ret;
BC_DTS_STATUS decoder_status; BC_DTS_STATUS decoder_status;
uint8_t trust_interlaced; uint8_t confirmed_interlaced;
uint8_t ignore_interlaced;
uint8_t interlaced; uint8_t interlaced;
CHDContext *priv = avctx->priv_data; CHDContext *priv = avctx->priv_data;
@@ -560,50 +561,50 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
} }
/* /*
* For most content, we can trust the interlaced flag returned * If we're expecting a second field, or we know that the next
* by the hardware, but sometimes we can't. These are the * picture has the same number as the current picture, then we're
* conditions under which we can trust the flag: * definitely interlaced.
* *
* 1) It's not h.264 content * Note that this test can return false negatives if the hardware
* 2) The UNKNOWN_SRC flag is not set * hasn't decoded the next picture or if there is a corruption in
* 3) We know we're expecting a second field * the stream. (In either case a 0 will be returned for the next
* 4) The hardware reports this picture and the next picture * picture number)
* have the same picture number.
*
* Note that there can still be interlaced content that will
* fail this check, if the hardware hasn't decoded the next
* picture or if there is a corruption in the stream. (In either
* case a 0 will be returned for the next picture number)
*/ */
trust_interlaced = avctx->codec->id != CODEC_ID_H264 || confirmed_interlaced = ((decoder_status.picNumFlags & ~0x40000000) ==
!(output->PicInfo.flags & VDEC_FLAG_UNKNOWN_SRC) || output->PicInfo.picture_number) ||
priv->need_second_field || priv->need_second_field;
(decoder_status.picNumFlags & ~0x40000000) ==
output->PicInfo.picture_number;
/* /*
* If we got a false negative for trust_interlaced on the first field, * If we got a false negative for confirmed_interlaced on the first field,
* we will realise our mistake here when we see that the picture number is that * we will realise our mistake here when we see that the picture number is that
* of the previous picture. We cannot recover the frame and should discard the * of the previous picture. We cannot recover the frame and should discard the
* second field to keep the correct number of output frames. * second field to keep the correct number of output frames.
*/ */
if (output->PicInfo.picture_number == priv->last_picture && !priv->need_second_field) { if (output->PicInfo.picture_number == priv->last_picture && !priv->need_second_field) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"Incorrectly guessed progressive frame. Discarding second field\n"); "Incorrectly guessed progressie frame. Discarding second field\n");
/* Returning without providing a picture. */ /* Returning without providing a picture. */
return RET_OK; return RET_OK;
} }
interlaced = (output->PicInfo.flags & VDEC_FLAG_INTERLACED_SRC) && /*
trust_interlaced; * Testing has, so far, shown that we can't trust the interlaced flag for
* H.264 content when VDEC_FLAG_UNKNOWN_SRC is set.
*/
ignore_interlaced = avctx->codec->id == CODEC_ID_H264 &&
(output->PicInfo.flags & VDEC_FLAG_UNKNOWN_SRC) &&
(pic_type == 0 || pic_type == PICT_FRAME ||
!confirmed_interlaced);
interlaced = (output->PicInfo.flags & VDEC_FLAG_INTERLACED_SRC) &&
(!ignore_interlaced || confirmed_interlaced);
if (!trust_interlaced && (decoder_status.picNumFlags & ~0x40000000) == 0) { if (ignore_interlaced && (decoder_status.picNumFlags & ~0x40000000) == 0) {
av_log(avctx, AV_LOG_VERBOSE, av_log(avctx, AV_LOG_WARNING,
"Next picture number unknown. Assuming progressive frame.\n"); "Next picture number unknown. Assuming progressive frame.\n");
} }
av_log(avctx, AV_LOG_VERBOSE, "Interlaced state: %d | trust_interlaced %d\n", av_log(avctx, AV_LOG_VERBOSE, "Interlaced state: %d | ignore_interlaced %d\n",
interlaced, trust_interlaced); interlaced, ignore_interlaced);
if (priv->pic.data[0] && !priv->need_second_field) if (priv->pic.data[0] && !priv->need_second_field)
avctx->release_buffer(avctx, &priv->pic); avctx->release_buffer(avctx, &priv->pic);